summaryrefslogtreecommitdiffstats
path: root/auth
diff options
context:
space:
mode:
authorJonathan Gathman <jonathan.gathman@att.com>2019-09-09 12:40:35 +0000
committerGerrit Code Review <gerrit@onap.org>2019-09-09 12:40:35 +0000
commit2eccd7c892fd7166d70c84a710e8e6b58138893c (patch)
tree7edb8ec74c705ed37d18509c5b869bc96c9257e3 /auth
parent128345fbbf2fe28d65899c4c0a02ff063a978076 (diff)
parenta5c7f79da240235b626b2e939f57f30b8e36d1a2 (diff)
Merge "Merge this if statement with the enclosing one"
Diffstat (limited to 'auth')
-rw-r--r--auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Cred.java6
1 files changed, 2 insertions, 4 deletions
diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Cred.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Cred.java
index 83638cc7..640efae7 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Cred.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/helpers/Cred.java
@@ -271,11 +271,9 @@ public class Cred {
public void inc(int type, Date start, Date expires) {
for (int i=0;i<dates.length-1;++i) {
if (start.before(dates[i])) {
- if (type==CredDAO.CERT_SHA256_RSA) {
- if (start.after(dates[i+1])) {
+ if ((type==CredDAO.CERT_SHA256_RSA)&&(start.after(dates[i+1]))) {
++x509Added[i];
- }
- }
+ }
if (expires.after(dates[i])) {
switch(type) {
case CredDAO.RAW: