summaryrefslogtreecommitdiffstats
path: root/auth
diff options
context:
space:
mode:
authorJonathan Gathman <jonathan.gathman@att.com>2019-10-08 12:27:38 +0000
committerGerrit Code Review <gerrit@onap.org>2019-10-08 12:27:38 +0000
commit5b247eb1e55ab15744187c30911fd4b5f6de8271 (patch)
tree557abc28fd3f9fbe1f159583c5c42a6d611a2f99 /auth
parentdccbc7ad51eaa4ace6f07806cfdf7e90248026a8 (diff)
parent09235a8304821e77a8734fef795f4405717de05e (diff)
Merge "Analyze.java-Merge this if statement with the enclosing one"
Diffstat (limited to 'auth')
-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);
}