diff options
| author |   Michael Mokry <mm117s@att.com> | 2018-01-11 15:23:36 -0600 |
|---|---|---|
| committer |   Pamela Dragosh <pdragosh@research.att.com> | 2018-01-12 16:09:48 +0000 |
| commit | 676d7d8dc9985e93d7c9cbc0412a26f2b19c23cd (patch) | |
| tree | c47935e62f7e4fe5bc1439b6a3f1a58cb72b0127 | |
| parent | 3f1933cfe1f5cdb6d3fefdff9248c9d4430849c2 (diff) | |
PDPGroup Audit Fix
*This fix will add new group to GroupEntity table if no default exists
during initialization and therefore provides a permanent solution to the
initialization errors on the PAP
Change-Id: Ie394d76b9cbc02cad15d62d6adea6fc17938f734
Issue-ID: POLICY-486
Signed-off-by: Michael Mokry <mm117s@att.com>
| -rw-r--r-- | ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/PolicyDBDao.java | 3 | ||||
| -rw-r--r-- | ONAP-XACML/src/main/java/org/onap/policy/xacml/std/pap/StdEngine.java | 1 |
2 files changed, 3 insertions, 1 deletions
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(); } } 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; } // |