X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ONAP-PAP-REST%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fpolicy%2Fpap%2Fxacml%2Frest%2Fcomponents%2FPolicyDBDao.java;h=bc64ba59b4e3cc51faff87fb8b2394a8ae072ee6;hb=676d7d8dc9985e93d7c9cbc0412a26f2b19c23cd;hp=7591781ffb57afe8ee1a05953bb488e9be54e563;hpb=3f1933cfe1f5cdb6d3fefdff9248c9d4430849c2;p=policy%2Fengine.git

diff --git a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/PolicyDBDao.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/PolicyDBDao.java
index 7591781ff..bc64ba59b 100644
--- a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/PolicyDBDao.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/PolicyDBDao.java
@@ -2843,7 +2843,8 @@ public class PolicyDBDao {
 	            try{
 		            while(policyIt.hasNext()){
 	            		PolicyEntity pol = policyIt.next();
-	            		if(getPolicyNameAndVersionFromPolicyFileName(pol.getPolicyName())[0].equals(policyName)){
+	            		if(policy.getScope().equals(pol.getScope()) && 
+	            				getPolicyNameAndVersionFromPolicyFileName(pol.getPolicyName())[0].equals(policyName)) {
 	            			policyIt.remove();
 	            		}  
 	            	}