diff options
| author |   Jonathan Gathman <jonathan.gathman@att.com> | 2019-09-19 15:39:23 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-09-19 15:39:23 +0000 |
| commit | d8ea11a483d65947152a411f10de44bc4c467ba2 (patch) | |
| tree | 2eb40dc240f4e4d4e11756debb20b896f726acb6 /auth | |
| parent | 4fff43312d90c103a445fa3df504676771e27566 (diff) | |
| parent | e1cae917bf8c18ab4965fdea27658246164f1406 (diff) | |
Merge " Mapper1_0.java-merge the if statement with existing one"
Diffstat (limited to 'auth')
| -rw-r--r-- | auth/auth-certman/src/main/java/org/onap/aaf/auth/cm/mapper/Mapper1_0.java | 9 |
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) { |