Fix the bug about nullpointer when update VIM

[aai/esr-server.git] / esr-mgr / src / main / java / org / onap / aai / esr / wrapper / VimManagerWrapper.java

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 (file)
--- 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;
     }