1 files changed, 4 insertions, 0 deletions
diff --git a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/controllers/OperationsApiController.java b/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/controllers/OperationsApiController.java
index ac9a8b1..6a4e561 100644
--- a/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/controllers/OperationsApiController.java
+++ b/ms/generic-resource-api/src/main/java/org/onap/sdnc/apps/ms/gra/controllers/OperationsApiController.java
@@ -484,8 +484,12 @@ public class OperationsApiController implements OperationsApi {
         // Add config tree data to SvcLogicContext
         List<ConfigServices> configServices = configServicesRepository.findBySvcInstanceId(svcInstanceId);
         ConfigServices configService = null;
+        String svcData = null;
         if (configServices != null && !configServices.isEmpty()) {
             configService = configServices.get(0);
+            svcData = configService.getSvcData();
+        }
+        if (svcData != null) {
             ctxIn.mergeJson("service-data", configService.getSvcData());
         } else {
             log.debug("exiting {} because the service-instance does not have any service data in SDN", svcOperation);