X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=datarouter-prov%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdatarouter%2Fprovisioning%2Fbeans%2FSubscription.java;h=0b07a5d94417f70f367f6de9b044e91a519b644a;hb=8ebd052e0b1066c432f5dba6ef69599eaf5ec27e;hp=c12d83d32b3d4261705d327445ae35faa77a80d8;hpb=15b5a700e4d2ea3572d38ccf1a8120040e23a038;p=dmaap%2Fdatarouter.git

diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/Subscription.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/Subscription.java
index c12d83d3..0b07a5d9 100644
--- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/Subscription.java
+++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/beans/Subscription.java
@@ -23,6 +23,8 @@
 
 package org.onap.dmaap.datarouter.provisioning.beans;
 
+import com.att.eelf.configuration.EELFLogger;
+import com.att.eelf.configuration.EELFManager;
 import java.io.InvalidObjectException;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -34,9 +36,6 @@ import java.util.Collection;
 import java.util.Date;
 import java.util.List;
 import java.util.Properties;
-
-import com.att.eelf.configuration.EELFLogger;
-import com.att.eelf.configuration.EELFManager;
 import org.json.JSONObject;
 import org.onap.dmaap.datarouter.provisioning.utils.DB;
 import org.onap.dmaap.datarouter.provisioning.utils.URLUtilities;
@@ -237,8 +236,7 @@ public class Subscription extends Syncable {
             this.feedid = jo.optInt(FEEDID_KEY, -1);
             this.groupid = jo.optInt(GROUPID_KEY, -1); //New field is added - Groups feature Rally:US708115 - 1610
             this.aafInstance = jo.optString("aaf_instance", "legacy");
-            if(!(aafInstance.equalsIgnoreCase("legacy"))){
-                if (aafInstance.length() > 255)
+            if(!(aafInstance.equalsIgnoreCase("legacy")) && aafInstance.length() > 255) {
                     throw new InvalidObjectException("aaf_instance field is too long");
             }
             JSONObject jdeli = jo.getJSONObject("delivery");
@@ -597,8 +595,8 @@ public class Subscription extends Syncable {
         if (feedid != os.feedid) {
             return false;
         }
-        if (groupid != os.groupid) //New field is added - Groups feature Rally:US708115 - 1610
-        {
+        if (groupid != os.groupid) {
+            //New field is added - Groups feature Rally:US708115 - 1610
             return false;
         }
         if (!delivery.equals(os.delivery)) {