From 0efbd308a9fdc886d662d43119379d9d47eaca0e Mon Sep 17 00:00:00 2001 From: lizi Date: Thu, 28 Sep 2017 09:59:31 +0800 Subject: [PATCH] Fix the bug about query VIM. 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 --- esr-mgr/src/main/java/org/onap/aai/esr/util/VimManagerUtil.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/esr-mgr/src/main/java/org/onap/aai/esr/util/VimManagerUtil.java b/esr-mgr/src/main/java/org/onap/aai/esr/util/VimManagerUtil.java index 1fc68a9..2a390d9 100644 --- a/esr-mgr/src/main/java/org/onap/aai/esr/util/VimManagerUtil.java +++ b/esr-mgr/src/main/java/org/onap/aai/esr/util/VimManagerUtil.java @@ -80,7 +80,10 @@ public class VimManagerUtil { VimRegisterInfo vimRegisterInfo = new VimRegisterInfo(); VimAuthInfo vimAuthInfo = new VimAuthInfo(); ArrayList vimAuthInfos = new ArrayList(); - 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; } } -- 2.16.6