Removing clumsy code smells and adding missing JettyFilter test

[dmaap/datarouter.git] / datarouter-prov / src / main / java / org / onap / dmaap / datarouter / provisioning / beans / Subscription.java

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 1cb1f2b..0b07a5d 100644 (file)
--- 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
@@ -236,8 +236,7 @@ public class Subscription extends Syncable {
             this.feedid = jo.optInt(FEEDID_KEY, -1);\r
             this.groupid = jo.optInt(GROUPID_KEY, -1); //New field is added - Groups feature Rally:US708115 - 1610\r
             this.aafInstance = jo.optString("aaf_instance", "legacy");\r
-            if(!(aafInstance.equalsIgnoreCase("legacy"))){\r
-                if (aafInstance.length() > 255)\r
+            if(!(aafInstance.equalsIgnoreCase("legacy")) && aafInstance.length() > 255) {\r
                     throw new InvalidObjectException("aaf_instance field is too long");\r
             }\r
             JSONObject jdeli = jo.getJSONObject("delivery");\r