From: Jorge Hernandez <jh1730@att.com>
Date: Tue, 16 Jan 2018 20:57:41 +0000 (+0000)
Subject: Merge "Restrict file upload size in policy editor"
X-Git-Tag: v1.2.0~183
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=528605fe8efa3631291de0b9bf8e498bdbd0c23f;hp=7f94862a50f552f840cbb2a84ee1c3e20fc3c708;p=policy%2Fengine.git

Merge "Restrict file upload size in policy editor"
---

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 70745b9b3..b2fb3e5a8 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
@@ -2839,7 +2839,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();
 	            		}  
 	            	}
diff --git a/ONAP-XACML/src/main/java/org/onap/policy/xacml/std/pap/StdEngine.java b/ONAP-XACML/src/main/java/org/onap/policy/xacml/std/pap/StdEngine.java
index 09c5a6aba..f046a3c45 100644
--- a/ONAP-XACML/src/main/java/org/onap/policy/xacml/std/pap/StdEngine.java
+++ b/ONAP-XACML/src/main/java/org/onap/policy/xacml/std/pap/StdEngine.java
@@ -171,6 +171,7 @@ public class StdEngine extends StdPDPItemSetChangeNotifier implements PAPPolicyE
 		//
 		PDPGroup group = this.getDefaultGroup();
 		if (group != null) {
+			wasDefaultGroupJustAdded = true;
 			return group;
 		}
 		//