X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=POLICY-SDK-APP%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fpolicy%2Fadmin%2FPolicyManagerServlet.java;h=5525379002f5ffd9252ab67e9959a4eaef10af82;hb=2ec4d9996e8185f83d6095dfaaa905442b5614b7;hp=b4817147c19bb0c5458ca8bb68278f13a9471041;hpb=b690f0a6776194ab085b9925f4811124203639ae;p=policy%2Fengine.git diff --git a/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/PolicyManagerServlet.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/PolicyManagerServlet.java index b4817147c..552537900 100644 --- a/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/PolicyManagerServlet.java +++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/PolicyManagerServlet.java @@ -736,8 +736,7 @@ public class PolicyManagerServlet extends HttpServlet { el.put("modifiedBy", getUserName(policy.getModifiedBy())); resultList.add(el); } - }else if(!scopes.isEmpty()){ - if(scopes.contains(scopeNameValue)){ + }else if(!scopes.isEmpty() && scopes.contains(scopeNameValue)){ JSONObject el = new JSONObject(); el.put("name", policy.getPolicyName().substring(policy.getPolicyName().lastIndexOf(File.separator)+1)); el.put("date", policy.getModifiedDate()); @@ -747,7 +746,6 @@ public class PolicyManagerServlet extends HttpServlet { el.put("createdBy", getUserName(policy.getCreatedBy())); el.put("modifiedBy", getUserName(policy.getModifiedBy())); resultList.add(el); - } } } }