diff options
| author |   Li Zi <li.zi30@zte.com.cn> | 2018-03-02 09:16:17 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-03-02 09:16:17 +0000 |
| commit | 336cdb316f039f6212211df12f894b3ef68920af (patch) | |
| tree | 1e4019cd676fe604bd61e086c72c5f9086ea63d8 | |
| parent | 36f3f5388cdc979f9bcb6d07e31ef817d85fdda1 (diff) | |
| parent | 64b7cc2b82655bd38788f83f36d1266cace70381 (diff) | |
Merge "Fix the bug about nullpointer when update VIM"
| -rw-r--r-- | esr-mgr/src/main/java/org/onap/aai/esr/wrapper/VimManagerWrapper.java | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/VimManagerWrapper.java b/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/VimManagerWrapper.java index 82c6f77..fe44536 100644 --- a/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/VimManagerWrapper.java +++ b/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/VimManagerWrapper.java @@ -207,16 +207,20 @@ public class VimManagerWrapper { private CloudRegionDetail getVimUpdateInfo(VimRegisterInfo vimRegisterInfo) { String cloudOwner = vimRegisterInfo.getCloudOwner(); String cloudRegionId = vimRegisterInfo.getCloudRegionId(); + String resourceVersion = null; + CloudRegionDetail cloudRegionDetail = new CloudRegionDetail(); CloudRegionDetail originalCloudRegionDetail = getOriginalCloudRegion(cloudOwner, cloudRegionId); - String resourceVersion = originalCloudRegionDetail.getResourceVersion(); - CloudRegionDetail cloudRegionDetail = vimManagerUtil.vimRegisterInfo2CloudRegion(vimRegisterInfo); - if (resourceVersion != null) { - cloudRegionDetail.setResourceVersion(resourceVersion); - EsrSystemInfo originalSystemInfo = originalCloudRegionDetail.getEsrSystemInfoList().getEsrSystemInfo().get(0); - cloudRegionDetail.getEsrSystemInfoList().getEsrSystemInfo().get(0) - .setEsrSystemInfoId(originalSystemInfo.getEsrSystemInfoId()); - cloudRegionDetail.getEsrSystemInfoList().getEsrSystemInfo().get(0) - .setResouceVersion(originalSystemInfo.getResouceVersion()); + if (originalCloudRegionDetail != null) { + resourceVersion = originalCloudRegionDetail.getResourceVersion(); + cloudRegionDetail = vimManagerUtil.vimRegisterInfo2CloudRegion(vimRegisterInfo); + if (resourceVersion != null) { + cloudRegionDetail.setResourceVersion(resourceVersion); + EsrSystemInfo originalSystemInfo = originalCloudRegionDetail.getEsrSystemInfoList().getEsrSystemInfo().get(0); + cloudRegionDetail.getEsrSystemInfoList().getEsrSystemInfo().get(0) + .setEsrSystemInfoId(originalSystemInfo.getEsrSystemInfoId()); + cloudRegionDetail.getEsrSystemInfoList().getEsrSystemInfo().get(0) + .setResouceVersion(originalSystemInfo.getResouceVersion()); + } } return cloudRegionDetail; } |