1 files changed, 4 insertions, 3 deletions

diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/provider/operation/impl/RestoreStack.java b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/provider/operation/impl/RestoreStack.java
index 7eeb23783..218684eb8 100644
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/provider/operation/impl/RestoreStack.java
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/src/main/java/org/onap/appc/adapter/iaas/provider/operation/impl/RestoreStack.java
@@ -100,7 +100,7 @@ public class RestoreStack extends ProviderStackOperation {
 
         String vm_url = null;
         Context context = null;
-
+        String tenantName = "Unknown";//to be used also in case of exception
         try {
 
             validateParametersExist(params, ProviderAdapter.PROPERTY_INSTANCE_URL,
@@ -114,8 +114,9 @@ public class RestoreStack extends ProviderStackOperation {
             context = resolveContext(rc, params, appName, vm_url);
 
             if (context != null) {
+                tenantName = context.getTenantName();//this varaible also is used in case of exception
                 stack = lookupStack(rc, context, stackId);
-                logger.debug(Msg.STACK_FOUND, vm_url, context.getTenantName(), stack.getStatus().toString());
+                logger.debug(Msg.STACK_FOUND, vm_url, tenantName, stack.getStatus().toString());
                 logger.info(EELFResourceManager.format(Msg.TERMINATING_STACK, stack.getName()));
                 restoreStack(stack, snapshotId);
                 logger.info(EELFResourceManager.format(Msg.TERMINATE_STACK, stack.getName()));
@@ -134,7 +135,7 @@ public class RestoreStack extends ProviderStackOperation {
             doFailure(rc, e.getStatus(), e.getMessage(), e);
         } catch (Exception e1) {
             String msg = EELFResourceManager.format(Msg.STACK_OPERATION_EXCEPTION, e1, e1.getClass().getSimpleName(),
-                    "restoreStack", vm_url, null == context ? "n/a" : context.getTenantName());
+                    "restoreStack", vm_url, tenantName);
             logger.error(msg, e1);
             doFailure(rc, HttpStatus.INTERNAL_SERVER_ERROR_500, msg, e1);
         }