From: Jonathan Gathman <jonathan.gathman@att.com>
Date: Tue, 8 Oct 2019 12:27:38 +0000 (+0000)
Subject: Merge "Analyze.java-Merge this if statement with the enclosing one"
X-Git-Tag: 2.1.17~103
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=aaf%2Fauthz.git;a=commitdiff_plain;h=5b247eb1e55ab15744187c30911fd4b5f6de8271;hp=dccbc7ad51eaa4ace6f07806cfdf7e90248026a8

Merge "Analyze.java-Merge this if statement with the enclosing one"
---

diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/reports/Analyze.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/reports/Analyze.java
index 5780c603..d7d97ad8 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/reports/Analyze.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/reports/Analyze.java
@@ -391,8 +391,7 @@ public class Analyze extends Batch {
                                 return;
                             }
                             // Just let expired UserRoles sit until deleted
-                            if(futureRange.inRange(ur.expires())) {
-                                if(!mur.containsKey(ur.user() + '|' + ur.role())) {
+                            if(futureRange.inRange(ur.expires())&&(!mur.containsKey(ur.user() + '|' + ur.role()))) {    
                                     // Cannot just delete owners, unless there is at least one left. Process later
                                     if ("owner".equals(ur.rname())) {
                                         Set<UserRole> urs = owners.get(ur.role());
@@ -410,8 +409,7 @@ public class Analyze extends Batch {
                                             }
                                         }
                                     }
-                                }
-                            }
+                             }
                         } catch (OrganizationException e) {
                             noAvg.error().log(e);
                         }