From 0cfec3c5d53ed995e66f135ccd584d7ab0950258 Mon Sep 17 00:00:00 2001 From: Gabriel Date: Tue, 3 Jul 2018 10:30:01 +0200 Subject: Fix weakness causing NPE Change-Id: I1f6bfa75990082dc411d813528702cc3cc140f5c Issue-ID: CLAMP-193 Signed-off-by: Gabriel --- .../java/org/onap/clamp/clds/client/req/sdc/SdcCatalogServices.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/main') diff --git a/src/main/java/org/onap/clamp/clds/client/req/sdc/SdcCatalogServices.java b/src/main/java/org/onap/clamp/clds/client/req/sdc/SdcCatalogServices.java index 9c940210..240094e6 100644 --- a/src/main/java/org/onap/clamp/clds/client/req/sdc/SdcCatalogServices.java +++ b/src/main/java/org/onap/clamp/clds/client/req/sdc/SdcCatalogServices.java @@ -17,6 +17,7 @@ * See the License for the specific language governing permissions and * limitations under the License. * ============LICENSE_END============================================ + * Modifications copyright (c) 2018 Nokia * =================================================================== * */ @@ -227,13 +228,12 @@ public class SdcCatalogServices { */ public List removeDuplicateSdcResourceBasicInfo( List rawCldsSdcResourceListBasicList) { - List cldsSdcResourceBasicInfoList = null; + List cldsSdcResourceBasicInfoList = new ArrayList<>(); if (rawCldsSdcResourceListBasicList != null && !rawCldsSdcResourceListBasicList.isEmpty()) { // sort list Collections.sort(rawCldsSdcResourceListBasicList); // and then take only the resources with the max version (last in // the list with the same name) - cldsSdcResourceBasicInfoList = new ArrayList<>(); for (int i = 1; i < rawCldsSdcResourceListBasicList.size(); i++) { // compare name with previous - if not equal, then keep the // previous (it's the last with that name) -- cgit 1.2.3-korg