Fix handling of aai 'get' errors

Now reject an event if the AAI get query for the event fails. Added test
cases for this behavior.

Fixed some issues from my previous pull request.

Issue-Id: POLICY-314
Change-Id: I674e95302a271423c307a88d061064e12e491a7a
Signed-off-by: Charles Cole <cc847m@att.com>

1 files changed, 5 insertions, 4 deletions

diff --git a/controlloop/common/actors/actor.vfc/src/main/java/org/onap/policy/controlloop/actor/vfc/VFCActorServiceProvider.java b/controlloop/common/actors/actor.vfc/src/main/java/org/onap/policy/controlloop/actor/vfc/VFCActorServiceProvider.java
index 814726256..7bf5a2826 100644
--- a/controlloop/common/actors/actor.vfc/src/main/java/org/onap/policy/controlloop/actor/vfc/VFCActorServiceProvider.java
+++ b/controlloop/common/actors/actor.vfc/src/main/java/org/onap/policy/controlloop/actor/vfc/VFCActorServiceProvider.java
@@ -72,13 +72,14 @@ public class VFCActorServiceProvider implements Actor {
         String serviceInstance = onset.AAI.get("service-instance.service-instance-id");
         if (serviceInstance == null || "".equals(serviceInstance))
         {
-        	if(vnfResponse == null) //if the response is null, we haven't queried
+        	AAIGETVnfResponse tempVnfResp = vnfResponse;
+        	if(tempVnfResp == null) //if the response is null, we haven't queried
         	{
-        		vnfResponse = getAAIServiceInstance(onset); //This does the AAI query since we haven't already
-        		if (vnfResponse == null)
+        		tempVnfResp = getAAIServiceInstance(onset); //This does the AAI query since we haven't already
+        		if (tempVnfResp == null)
         		    return null;
         	}
-        	serviceInstance = vnfResponse.serviceId;
+        	serviceInstance = tempVnfResp.serviceId;
         }
         request.nsInstanceId = serviceInstance;
         request.requestId = onset.requestID;