summary |
shortlog |
log |
commit | commitdiff |
review |
tree
raw |
patch |
inline | side by side (from parent 1:
c7ebb39)
*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>
(cherry picked from commit
676d7d8dc9985e93d7c9cbc0412a26f2b19c23cd)
try{
while(policyIt.hasNext()){
PolicyEntity pol = policyIt.next();
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)) {
//
PDPGroup group = this.getDefaultGroup();
if (group != null) {
//
PDPGroup group = this.getDefaultGroup();
if (group != null) {
+ wasDefaultGroupJustAdded = true;