Merge this if statement with the enclosing one
Issue-ID: AAF-876
Change-Id: Ibd707a4bd159861dec750610711840d35d9da22c
Signed-off-by: Thugutla sailakshmi <tsaila10@in.ibm.com>
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());
}
}
}
- }
- }
+ }
} catch (OrganizationException e) {
noAvg.error().log(e);
}