summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYan Yang <yangyanyj@chinamobile.com>2018-09-05 01:13:16 +0000
committerGerrit Code Review <gerrit@onap.org>2018-09-05 01:13:16 +0000
commitab59c09e4b47e0bea715ec723bfd5a8e73840f6f (patch)
tree2632128c619309aa324a6e62ec19db717e6a4073
parent2c7785c5f171e90696f58be841f52c193c16aba1 (diff)
parent82801c67615cc7d392b1938cabb8230e831c791f (diff)
Merge "Returning expression instead of variable"
-rw-r--r--juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/process/VnfResourceMgr.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/process/VnfResourceMgr.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/process/VnfResourceMgr.java
index d0a1f01..80d24d3 100644
--- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/process/VnfResourceMgr.java
+++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/process/VnfResourceMgr.java
@@ -211,8 +211,7 @@ public class VnfResourceMgr {
if(vnfmInfo != null && StringUtils.isNotBlank(vnfmInfo.getExtend())){
JSONObject json = JSONObject.fromObject(vnfmInfo.getExtend());
JSONObject extVirtualLinkLink = json.getJSONArray("extVirtualLinks").getJSONObject(0);
- String vimId = extVirtualLinkLink.getJSONObject("vim").getString("vimid");
- return vimId;
+ return extVirtualLinkLink.getJSONObject("vim").getString("vimid");
}
} catch(Exception e) {
LOG.error("vnfmInfo.getExtend() format error!please check it",e);