Fix the invalid namespace 500 error model query

Issue-ID: AAI-205

Change-Id: I09dde57a2f69ef56acc5c87a5b0472e353e492aa
Signed-off-by: Venkata Harish K Kajur <vk250x@att.com>

diff --git a/aai-traversal/src/main/java/org/openecomp/aai/dbgraphmap/SearchGraph.java b/aai-traversal/src/main/java/org/openecomp/aai/dbgraphmap/SearchGraph.java
index e68ab1a..58c4d1d 100644 (file)
--- a/aai-traversal/src/main/java/org/openecomp/aai/dbgraphmap/SearchGraph.java
+++ b/aai-traversal/src/main/java/org/openecomp/aai/dbgraphmap/SearchGraph.java
@@ -547,9 +547,8 @@ public class SearchGraph {
                        HashMap<String,Object> namedQueryLookupHash = new HashMap<String,Object>();
 
                        DynamicEntity qp = modelAndNamedQuerySearch.get("queryParameters");
-
                        String namedQueryUuid = null;
-                       if (qp.isSet("namedQuery")) { 
+                       if ((qp != null) && qp.isSet("namedQuery")) {    
                                DynamicEntity namedQuery = (DynamicEntity) qp.get("namedQuery");
 
                                if (namedQuery.isSet("namedQueryUuid")) { 
@@ -666,9 +665,6 @@ public class SearchGraph {
                        if (modelAndNamedQuerySearch == null) { 
                                throw new AAIException("AAI_5105");
                        }
-                       if (modelAndNamedQuerySearch == null) { 
-                               throw new AAIException("AAI_5105");
-                       }
 
                        Map<String,Object> modelQueryLookupHash = new HashMap<>();