From: Chandan Ghosh <cghosh12@in.ibm.com>
Date: Mon, 3 Dec 2018 08:57:48 +0000 (+0530)
Subject: Added fix for potential nullpointer exception
X-Git-Tag: 1.4.1~405^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=fb07209408b026e1eac2258332d6e93d927f8236;p=so.git

Added fix for potential nullpointer exception

Added fix for potential nullpointerexception

Issue-ID: SO-1263
Change-Id: Iaf7ab5b170ddcca03f597ab9f9a951afcee2d2f9
Signed-off-by: Chandan Ghosh <cghosh12@in.ibm.com>
---

diff --git a/adapters/mso-catalog-db-adapter/src/main/java/org/onap/so/adapters/catalogdb/rest/CatalogDbAdapterRest.java b/adapters/mso-catalog-db-adapter/src/main/java/org/onap/so/adapters/catalogdb/rest/CatalogDbAdapterRest.java
index 2fc1c3d70a..e9018dd7be 100644
--- a/adapters/mso-catalog-db-adapter/src/main/java/org/onap/so/adapters/catalogdb/rest/CatalogDbAdapterRest.java
+++ b/adapters/mso-catalog-db-adapter/src/main/java/org/onap/so/adapters/catalogdb/rest/CatalogDbAdapterRest.java
@@ -580,8 +580,9 @@ public class CatalogDbAdapterRest {
 
                 if (null == recipe) {
                     NetworkResource nResource = networkResourceRepo.findResourceByModelUUID(rmUuid);
-                    recipe = networkRecipeRepo.findFirstByModelNameAndActionAndVersionStr(nResource.getModelName(), action, vnf.getModelVersion());
-
+                    if(null!=vnf) {
+                    	recipe = networkRecipeRepo.findFirstByModelNameAndActionAndVersionStr(nResource.getModelName(), action, vnf.getModelVersion());
+                    }
                     // for network fetch the default recipe
                     if (recipe == null) {
                         recipe = networkRecipeRepo.findFirstByModelNameAndAction("SDNC_DEFAULT", action);