Merge "ONAP AAI GET Query code"

1 files changed, 9 insertions, 0 deletions

diff --git a/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopEventManager.java b/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopEventManager.java
index fd040494f..f891a2c6a 100644
--- a/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopEventManager.java
+++ b/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopEventManager.java
@@ -537,16 +537,25 @@ public class ControlLoopEventManager implements LockCallback, Serializable {
 			try {
 				if (event.AAI.get("generic-vnf.vnf-id") != null) {
 			       vnfResponse = getAAIVnfInfo(event); 
+			       if (vnfResponse == null) {
+			    	   throw new ControlLoopException("AAI Response is null (query by vnf-id)");
+			       }
 			       if (vnfResponse != null && isClosedLoopDisabled(vnfResponse) == true) {
 					   throw new ControlLoopException("is-closed-loop-disabled is set to true");	
 			       }
 				} else if (event.AAI.get("generic-vnf.vnf-name") != null) {
 				    vnfResponse = getAAIVnfInfo(event); 
+				    if (vnfResponse == null) {
+				    	throw new ControlLoopException("AAI Response is null (query by vnf-name)");
+				    }
 				    if (vnfResponse != null && isClosedLoopDisabled(vnfResponse) == true) {
 						throw new ControlLoopException("is-closed-loop-disabled is set to true");	
 				    }
 				} else if (event.AAI.get("vserver.vserver-name") != null) {
 				    vserverResponse = getAAIVserverInfo(event); 
+				    if (vserverResponse == null) {
+				       throw new ControlLoopException("AAI Response is null (query by vserver-name)");
+				    }
 				    if (vserverResponse != null && isClosedLoopDisabled(vserverResponse) == true) {
 						throw new ControlLoopException("is-closed-loop-disabled is set to true");	
 				    }