Merge "Fix potential null pointer"

[aai/sparky-be.git] / sparkybe-onap-service / src / main / java / org / onap / aai / sparky / viewandinspect / services / BaseVisualizationService.java

diff --git a/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/viewandinspect/services/BaseVisualizationService.java b/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/viewandinspect/services/BaseVisualizationService.java
index afb0363..69acc42 100644 (file)
--- a/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/viewandinspect/services/BaseVisualizationService.java
+++ b/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/viewandinspect/services/BaseVisualizationService.java
@@ -193,7 +193,7 @@ public class BaseVisualizationService implements VisualizationService {
   public OperationResult buildVisualizationUsingGenericQuery(QueryRequest queryRequest) {
 
     OperationResult returnValue = new OperationResult();
-    OperationResult dataCollectionResult = new OperationResult();
+    OperationResult dataCollectionResult;
     QueryParams queryParams = null;
     SearchableEntity sourceEntity = null;
 
@@ -220,7 +220,7 @@ public class BaseVisualizationService implements VisualizationService {
       dataCollectionResult = new OperationResult(500, "Failed to get nodes-query result from AAI");
     }
 
-    if (dataCollectionResult.getResultCode() == 200) {
+    if (dataCollectionResult == null || dataCollectionResult.getResultCode() == 200) {
 
       String d3OutputJsonOutput = null;