From: romaingimbert <romain.gimbert@orange.com>
Date: Mon, 23 Apr 2018 09:24:52 +0000 (+0200)
Subject: fix NPE on serviceInventory
X-Git-Tag: 2.0.0-ONAP~32^2~2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F13%2F44113%2F1;p=externalapi%2Fnbi.git

fix NPE on serviceInventory
-service without VNF

Change-Id: Ia61b6d63e2a35197074e7df70917d2aa6f53ee96
Issue-ID: EXTAPI-69
Signed-off-by: romaingimbert <romain.gimbert@orange.com>
---

diff --git a/src/main/java/org/onap/nbi/apis/serviceinventory/ServiceInventoryService.java b/src/main/java/org/onap/nbi/apis/serviceinventory/ServiceInventoryService.java
index 707c9e9..a4347d4 100644
--- a/src/main/java/org/onap/nbi/apis/serviceinventory/ServiceInventoryService.java
+++ b/src/main/java/org/onap/nbi/apis/serviceinventory/ServiceInventoryService.java
@@ -102,16 +102,19 @@ public class ServiceInventoryService {
 
         List<LinkedHashMap> vnfs = new ArrayList<>();
         LinkedHashMap relationShip = (LinkedHashMap) serviceResponse.get("relationship-list");
-        List<LinkedHashMap> relationsList = (List<LinkedHashMap>) relationShip.get("relationship");
-        for (LinkedHashMap relation : relationsList) {
-            String relatedLink = (String) relation.get("related-link");
-            LinkedHashMap vnf = aaiClient.getVNF(relatedLink);
-            if (vnf != null) {
-                vnfs.add(vnf);
+        if(relationShip!=null) {
+            List<LinkedHashMap> relationsList = (List<LinkedHashMap>) relationShip.get("relationship");
+            if(relationsList!=null) {
+                for (LinkedHashMap relation : relationsList) {
+                    String relatedLink = (String) relation.get("related-link");
+                    LinkedHashMap vnf = aaiClient.getVNF(relatedLink);
+                    if (vnf != null) {
+                        vnfs.add(vnf);
+                    }
+                }
+                serviceResponse.put("vnfs", vnfs);
             }
         }
-        serviceResponse.put("vnfs", vnfs);
-
     }