summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorInstrumental <jonathan.gathman@att.com>2018-07-03 17:22:46 -0500
committerInstrumental <jonathan.gathman@att.com>2018-07-03 17:22:55 -0500
commit9128eb75b403f341b1c16ee738b9a1743088f9e3 (patch)
tree4ae2c678db0ecb44b9bf64ef54b51cbfd16d3415
parentbe77aefb3a8cddfe21e93e55da8ee7e4f331b8fb (diff)
From IAN, fix NPE (accidentally abandoned)
Issue-ID: AAF-384 Change-Id: I3ebd2de938075662e35ed767463bf251b3ee97f3 Signed-off-by: Instrumental <jonathan.gathman@att.com>
-rw-r--r--auth/auth-batch/src/main/java/org/onap/aaf/auth/update/Expiring.java9
1 files changed, 6 insertions, 3 deletions
diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/update/Expiring.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/update/Expiring.java
index df631fe3..f3388326 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/update/Expiring.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/update/Expiring.java
@@ -181,13 +181,16 @@ public class Expiring extends Batch {
if(ur.expires().after(future)) { // no need for Approval anymore
a.delayDelete(noAvg, apprDAO, dryRun, "User Role already Extended");
UUID tkt = a.getTicket();
- if(tkt!=null) {
- f = Future.data.get(tkt);
+ if(tkt!=null && Future.data.containsKey(tkt)) {
+ f = Future.data.get(a.getTicket());
}
}
} else {
a.delayDelete(noAvg, apprDAO, dryRun, "User Role does not exist");
- f = Future.data.get(a.getTicket());
+ UUID tkt = a.getTicket();
+ if(tkt !=null && Future.data.containsKey(tkt)) {
+ f = Future.data.get(a.getTicket());
+ }
}
if(f!=null) {
f.delayedDelete(noAvg, futureDAO, dryRun, "Approvals removed");