Fix instance instantiation for CCVPN

Change-Id: I4f93d3b2964ced25f66ae9860b4ed64fa5e18701
Issue-ID: USECASEUI-170
Signed-off-by: guochuyicmri <guochuyi@chinamobile.com>

diff --git a/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultServiceInstanceService.java b/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultServiceInstanceService.java
index 9c42051..9356ef8 100644 (file)
--- a/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultServiceInstanceService.java
+++ b/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultServiceInstanceService.java
@@ -109,6 +109,9 @@ public class DefaultServiceInstanceService implements ServiceInstanceService {
                        JSONObject object =  JSON.parseObject(serviceInstance+"");
                        String serviceInstanceId=object.get("service-instance-id").toString();
                        ServiceBean serviceBean = serviceLcmService.getServiceBeanByServiceInStanceId(serviceInstanceId);
+                       if(!UuiCommonUtil.isNotNullOrEmpty(serviceBean)){
+                               continue;
+                       }
                        String serviceDomain = serviceBean.getServiceDomain();
                                object.put("serviceDomain",serviceDomain);
                                if("SOTN".equals(serviceDomain)||"CCVPN".equals(serviceDomain)||"E2E Service".equals(serviceDomain)||"Network Service".equals(serviceDomain)){