From 22768c14fbbfff16c0344d06f80b00d26f24580f Mon Sep 17 00:00:00 2001 From: Thugutla sailakshmi Date: Mon, 21 Oct 2019 13:20:54 +0530 Subject: [PATCH] CMService.java-Merge if statement Issue-ID: AAF-876 Change-Id: If05842f2a727e4f4f756ee782252e9722178fcfd Signed-off-by: Thugutla sailakshmi --- .../src/main/java/org/onap/aaf/auth/cm/service/CMService.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) 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 certs = Factory.toX509Certificate(cdd.x509); for(Iterator 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) { -- 2.16.6