Unable to delete old service instances created of old ASDC service

[vid.git] / vid-app-common / src / main / java / org / onap / vid / controller / AaiServiceInstanceStandardQueryController.java

diff --git a/vid-app-common/src/main/java/org/onap/vid/controller/AaiServiceInstanceStandardQueryController.java b/vid-app-common/src/main/java/org/onap/vid/controller/AaiServiceInstanceStandardQueryController.java
index 015f8dc..c467d99 100644 (file)
--- a/vid-app-common/src/main/java/org/onap/vid/controller/AaiServiceInstanceStandardQueryController.java
+++ b/vid-app-common/src/main/java/org/onap/vid/controller/AaiServiceInstanceStandardQueryController.java
@@ -139,6 +139,10 @@ public class AaiServiceInstanceStandardQueryController extends VidRestrictedBase
         if (serviceModel == null) {
             throw new GenericUncheckedException("Internal error while fetching Service Model: " + sdcModelUuid);
         }
+        if (serviceModel.getService() == null || serviceModel.getService().getVidNotions() == null) {
+            return false;
+        }
+
         VidNotions.ModelCategory serviceModelCategory = serviceModel.getService().getVidNotions().getModelCategory();
         return (serviceModelCategory == VidNotions.ModelCategory.IS_5G_PROVIDER_NETWORK_MODEL) ||
                 (serviceModelCategory == VidNotions.ModelCategory.IS_5G_FABRIC_CONFIGURATION_MODEL);