From: Thugutla sailakshmi <tsaila10@in.ibm.com>
Date: Mon, 21 Oct 2019 07:50:54 +0000 (+0530)
Subject: CMService.java-Merge if statement
X-Git-Tag: 2.1.17~55^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=aaf%2Fauthz.git;a=commitdiff_plain;h=22768c14fbbfff16c0344d06f80b00d26f24580f

CMService.java-Merge if statement

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

diff --git a/auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/service/CMService.java b/auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/service/CMService.java
index 88109437..67325034 100644
--- a/auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/service/CMService.java
+++ b/auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/service/CMService.java
@@ -366,11 +366,9 @@ public class CMService {
                             Collection<? extends Certificate> certs = Factory.toX509Certificate(cdd.x509);
                             for(Iterator<? extends Certificate> iter = certs.iterator(); iter.hasNext();) {
                                 X509Certificate x509 = (X509Certificate)iter.next();
-                                if(x509.getNotAfter().after(now) && x509.getSubjectDN().getName().contains(cn)) {
-                                    if(++count>max_509s) {
+                                if((x509.getNotAfter().after(now) && x509.getSubjectDN().getName().contains(cn))&&(++count>max_509s)) {
                                         break;
-                                    }
-                                }
+                                     }
                             }
                         }
                         if(count>max_509s) {