From 09235a8304821e77a8734fef795f4405717de05e Mon Sep 17 00:00:00 2001 From: Thugutla sailakshmi Date: Thu, 3 Oct 2019 18:52:02 +0530 Subject: 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 --- .../src/main/java/org/onap/aaf/auth/batch/reports/Analyze.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'auth/auth-batch/src/main/java/org/onap') 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 urs = owners.get(ur.role()); @@ -410,8 +409,7 @@ public class Analyze extends Batch { } } } - } - } + } } catch (OrganizationException e) { noAvg.error().log(e); } -- cgit 1.2.3-korg