From: guochuyicmri <guochuyi@chinamobile.com>
Date: Sun, 11 Nov 2018 06:10:36 +0000 (+0800)
Subject: Fix instance instantiation for CCVPN
X-Git-Tag: 1.2.1~9
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F83%2F72383%2F1;p=usecase-ui%2Fserver.git

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 9c420518..9356ef82 100644
--- 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)){