From: Thugutla sailakshmi <tsaila10@in.ibm.com>
Date: Thu, 5 Sep 2019 09:42:55 +0000 (+0530)
Subject: Merge this if statement with the enclosing one
X-Git-Tag: 2.1.17~126^2~1
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=aaf%2Fauthz.git;a=commitdiff_plain;h=a5c7f79da240235b626b2e939f57f30b8e36d1a2

Merge this if statement with the enclosing one

Merge this if statement with the enclosing one

Issue-ID: AAF-876
Change-Id: Ieb5cc4b96281bdbcf4a809371986fbe9160bab26
Signed-off-by: Thugutla sailakshmi <tsaila10@in.ibm.com>
---

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: