Fix the bug about query VIM. 63/16163/1
authorlizi <li.zi30@zte.com.cn>
Thu, 28 Sep 2017 01:59:31 +0000 (09:59 +0800)
committerlizi <li.zi30@zte.com.cn>
Thu, 28 Sep 2017 01:59:31 +0000 (09:59 +0800)
Fix the bug "If a cloud-region didn't contain a external system info, there will be an null pointer error".

Change-Id: I2cdd45bfc9836ce8369feb4d5af6bc6bcee84201
Issue-ID: AAI-398
Signed-off-by: lizi <li.zi30@zte.com.cn>
esr-mgr/src/main/java/org/onap/aai/esr/util/VimManagerUtil.java

index 1fc68a9..2a390d9 100644 (file)
@@ -80,7 +80,10 @@ public class VimManagerUtil {
     VimRegisterInfo vimRegisterInfo = new VimRegisterInfo();
     VimAuthInfo vimAuthInfo = new VimAuthInfo();
     ArrayList<VimAuthInfo> vimAuthInfos = new ArrayList<VimAuthInfo>();
-    vimAuthInfo = authInfo2VimAuthInfo(cloudRegion.getEsrSystemInfoList().getEsrSystemInfo().get(0));
+    if(cloudRegion.getEsrSystemInfoList()!=null){
+      vimAuthInfo = authInfo2VimAuthInfo(cloudRegion.getEsrSystemInfoList().getEsrSystemInfo().get(0));
+      vimRegisterInfo.setStatus(cloudRegion.getEsrSystemInfoList().getEsrSystemInfo().get(0).getSystemStatus());
+    }
     vimAuthInfos.add(vimAuthInfo);
     vimRegisterInfo.setVimAuthInfos(vimAuthInfos);
     vimRegisterInfo.setCloudExtraInfo(cloudRegion.getCloudExtraInfo());
@@ -91,7 +94,6 @@ public class VimManagerUtil {
     vimRegisterInfo.setComplexName(cloudRegion.getComplexName());
     vimRegisterInfo.setCloudRegionVersion(cloudRegion.getCloudRegionVersion());
     vimRegisterInfo.setOwnerDefinedType(cloudRegion.getOwnerDefinedType());
-    vimRegisterInfo.setStatus(cloudRegion.getEsrSystemInfoList().getEsrSystemInfo().get(0).getSystemStatus());
     return vimRegisterInfo;
   }
 }