summaryrefslogtreecommitdiffstats
path: root/auth/auth-batch/src/main
diff options
context:
space:
mode:
authorThugutla sailakshmi <tsaila10@in.ibm.com>2019-10-03 18:52:02 +0530
committerThugutla Sai Lakshmi <tsaila10@in.ibm.com>2019-10-03 13:27:21 +0000
commit09235a8304821e77a8734fef795f4405717de05e (patch)
tree9f90f92435f1cb993bd03bf52db4f31967451dcf /auth/auth-batch/src/main
parent6b7b912348ae60b2217af57749ac00a67080bf12 (diff)
Analyze.java-Merge this if statement with the enclosing one
Merge this if statement with the enclosing one Issue-ID: AAF-876 Change-Id: Ibd707a4bd159861dec750610711840d35d9da22c Signed-off-by: Thugutla sailakshmi <tsaila10@in.ibm.com>
Diffstat (limited to 'auth/auth-batch/src/main')
-rw-r--r--auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/reports/Analyze.java6
1 files changed, 2 insertions, 4 deletions
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);
}