summaryrefslogtreecommitdiffstats
path: root/auth
diff options
context:
space:
mode:
authorJonathan Gathman <jonathan.gathman@att.com>2019-11-06 13:39:19 +0000
committerGerrit Code Review <gerrit@onap.org>2019-11-06 13:39:19 +0000
commit74300061e1ea941f603b1563b3fc8d8026902b2a (patch)
tree6c6ece73601fdca282df7ba89b6150fdd800f433 /auth
parentdba91fb2b1a12b34691840af97cfbb5fd28917d7 (diff)
parent22768c14fbbfff16c0344d06f80b00d26f24580f (diff)
Merge "CMService.java-Merge if statement"
Diffstat (limited to 'auth')
-rw-r--r--auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/service/CMService.java6
1 files 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 c85b4ca7..3130e5b2 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
@@ -364,11 +364,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) {