summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorguochuyicmri <guochuyi@chinamobile.com>2018-11-11 14:10:36 +0800
committerguochuyicmri <guochuyi@chinamobile.com>2018-11-11 14:10:46 +0800
commita6de6548ba15f72f0729ac7635de0d19124d1d9f (patch)
tree4ab872402ad3a732d0595a8b218d74d04ea0d07e
parenta0582f64b704001456d1b67bcf6342c4f06bff99 (diff)
Fix instance instantiation for CCVPN
Change-Id: I4f93d3b2964ced25f66ae9860b4ed64fa5e18701 Issue-ID: USECASEUI-170 Signed-off-by: guochuyicmri <guochuyi@chinamobile.com>
-rw-r--r--server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultServiceInstanceService.java3
1 files changed, 3 insertions, 0 deletions
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)){