diff options
| author |   varun gudisena <vg411h@att.com> | 2018-07-03 22:39:15 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-07-03 22:39:15 +0000 |
| commit | d41c5dc8c946fef66b64e8f95392b07403a93638 (patch) | |
| tree | 10fc718b45e53765902eee1fdfd6ea0e222cb093 | |
| parent | b2bf352416708369b34836cd2378a88341129afd (diff) | |
| parent | 9128eb75b403f341b1c16ee738b9a1743088f9e3 (diff) | |
Merge "From IAN, fix NPE (accidentally abandoned)"
| -rw-r--r-- | auth/auth-batch/src/main/java/org/onap/aaf/auth/update/Expiring.java | 9 |
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"); |