summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThugutla sailakshmi <tsaila10@in.ibm.com>2019-09-18 10:27:21 +0530
committerThugutla sailakshmi <tsaila10@in.ibm.com>2019-09-18 10:27:42 +0530
commite1cae917bf8c18ab4965fdea27658246164f1406 (patch)
tree2cf44c416c06d24db29fdedddef64952e8d37829
parentb907ab4b6d721c875b042a89c7c8c071ba0dd4a9 (diff)
Mapper1_0.java-merge the if statement with existing one
Mapper1_0.java-merge the if statement with existing one Issue-ID: AAF-876 Change-Id: I1d50c3337ec2d42e0b8ded17e0cd47e70665b4e6 Signed-off-by: Thugutla sailakshmi <tsaila10@in.ibm.com>
-rw-r--r--auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/mapper/Mapper1_0.java9
1 files changed, 4 insertions, 5 deletions
diff --git a/auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/mapper/Mapper1_0.java b/auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/mapper/Mapper1_0.java
index 1c951961..bce7eccd 100644
--- a/auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/mapper/Mapper1_0.java
+++ b/auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/mapper/Mapper1_0.java
@@ -3,6 +3,7 @@
* org.onap.aaf
* ===========================================================================
* Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2019 IBM.
* ===========================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -123,11 +124,9 @@ public class Mapper1_0 implements Mapper<BaseRequest,CertInfo,Artifacts,Error> {
// Certs in keystore versus Truststore. Separate in Version 2_0
if (cin.trustCAs()!=null) {
for (String c : cin.trustCAs()) {
- if (c!=null) {
- if (!cout.getCerts().contains(c)) {
- cout.getCerts().add(c);
- }
- }
+ if ((c!=null)&&(!cout.getCerts().contains(c))) {
+ cout.getCerts().add(c);
+ }
}
}
if (cin.notes()!=null) {