Make Organization isRevoked return Date

[aaf/authz.git] / auth / auth-batch / src / main / java / org / onap / aaf / auth / batch / reports / NotInOrg.java

diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/reports/NotInOrg.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/reports/NotInOrg.java
index 82542e1..dc45eca 100644 (file)
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/reports/NotInOrg.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/reports/NotInOrg.java
@@ -99,7 +99,7 @@ public class NotInOrg extends Batch {
     @Override
     protected void run(AuthzTrans trans) {
         try {
-            Map<String,Boolean> checked = new TreeMap<String, Boolean>();
+            Map<String,Boolean> checked = new TreeMap<>();
             trans.info().log("Process Organization Identities");
             trans.info().log("User Roles");
 
@@ -134,7 +134,8 @@ public class NotInOrg extends Batch {
     private Writer whichWriter(AuthzTrans transNoAvg, String id) {
         Writer w = whichWriter.get(id);
         if(w==null) {
-            w = org.isRevoked(transNoAvg, id)?
+               Date revoked = org.isRevoked(transNoAvg, id); 
+            w = revoked != null?
                     notInOrgDeleteW:
                     notInOrgW;
             whichWriter.put(id,w);