summaryrefslogtreecommitdiffstats
path: root/auth/auth-batch/src/main
diff options
context:
space:
mode:
authorJonathan Gathman <jonathan.gathman@att.com>2019-02-21 13:28:47 +0000
committerGerrit Code Review <gerrit@onap.org>2019-02-21 13:28:47 +0000
commitd9c0bb04b77f6a637f1fc07b69c90898d672bd34 (patch)
treee1bbf5548593e2abb38630016d5fe4c13fc25131 /auth/auth-batch/src/main
parent815bb520743dc523f69bebc367391872888fd5ef (diff)
parent00cd7c51f8b6e406e348572d229e4ea1f761cc10 (diff)
Merge "Sonar Fix: NotifyApprovals.java"
Diffstat (limited to 'auth/auth-batch/src/main')
-rw-r--r--auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/update/NotifyApprovals.java12
1 files changed, 7 insertions, 5 deletions
diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/update/NotifyApprovals.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/update/NotifyApprovals.java
index 4acf269d..7138a7c9 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/update/NotifyApprovals.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/update/NotifyApprovals.java
@@ -3,6 +3,8 @@
* org.onap.aaf
* ===========================================================================
* Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
+ *
+ * Modifications Copyright (C) 2018 IBM.
* ===========================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -107,14 +109,16 @@ public class NotifyApprovals extends Batch {
Message msg = new Message();
int emailCount = 0;
List<Approval> pending = new ArrayList<>();
- boolean isOwner,isSupervisor;
+ boolean isOwner;
+ boolean isSupervisor;
for (Entry<String, List<Approval>> es : Approval.byApprover.entrySet()) {
isOwner = isSupervisor = false;
String approver = es.getKey();
if (approver.indexOf('@')<0) {
approver += org.getRealm();
}
- Date latestNotify=null, soonestExpire=null;
+ Date latestNotify=null;
+ Date soonestExpire=null;
GregorianCalendar latest=new GregorianCalendar();
GregorianCalendar soonest=new GregorianCalendar();
pending.clear();
@@ -165,8 +169,7 @@ public class NotifyApprovals extends Batch {
}
}
}
- if (go) {
- if (maxEmails>emailCount++) {
+ if (go && (maxEmails>emailCount++)) {
try {
Organization org = OrganizationFactory.obtain(env, approver);
Identity user = org.getIdentity(noAvg, approver);
@@ -222,7 +225,6 @@ public class NotifyApprovals extends Batch {
} catch (OrganizationException e) {
trans.info().log(e);
}
- }
}
}
}