Code Review
/
policy
/
engine.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
review
|
tree
raw
(from parent 2:
7f94862
)
Merge "Restrict file upload size in policy editor"
author
Jorge Hernandez
<jh1730@att.com>
Tue, 16 Jan 2018 20:57:41 +0000
(20:57 +0000)
committer
Gerrit Code Review
<gerrit@onap.org>
Tue, 16 Jan 2018 20:57:41 +0000
(20:57 +0000)
ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/PolicyDBDao.java
patch
|
blob
|
history
ONAP-XACML/src/main/java/org/onap/policy/xacml/std/pap/StdEngine.java
patch
|
blob
|
history
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
70745b9
..
b2fb3e5
100644
(file)
--- 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
09c5a6a
..
f046a3c
100644
(file)
--- 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;
}
//