Piotr Kliczewski has uploaded a new change for review. Change subject: core: NPE when getVMFullList returns no vm information ......................................................................
core: NPE when getVMFullList returns no vm information When getVMFullList fetches no information the code fails with NPE. Bug-Url: https://bugzilla.redhat.com/1135959 Change-Id: Iefbf71dd19bc6c759f1ef2ac02a2f6136146989f Signed-off-by: pkliczewski <[email protected]> --- M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VMListReturnForXmlRpc.java 2 files changed, 1 insertion(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/88/32288/1 diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java index ba2bff7..f0ceb0b 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java @@ -1669,9 +1669,6 @@ if (!vmsToQuery.isEmpty()) { // Query VDSM for VMs info, and creating a proper VMStatic to be used when importing them Map[] vmsInfo = getVmInfo(vmsToQuery); - if (vmsInfo == null) { - return; - } for (Map vmInfo : vmsInfo) { Guid vmId = Guid.createGuidFromString((String) vmInfo.get(VdsProperties.vm_guid)); VmStatic vmStatic = new VmStatic(); diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VMListReturnForXmlRpc.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VMListReturnForXmlRpc.java index 9c8bc04..3e0e2ef 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VMListReturnForXmlRpc.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VMListReturnForXmlRpc.java @@ -17,7 +17,7 @@ private static final String VM_LIST = "vmList"; public StatusForXmlRpc mStatus; - public Map<String, Object>[] mVmList; + public Map<String, Object>[] mVmList = new HashMap[0];; public VMListReturnForXmlRpc(Map<String, Object> innerMap) { mStatus = new StatusForXmlRpc((Map<String, Object>) innerMap.get(STATUS)); -- To view, visit http://gerrit.ovirt.org/32288 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iefbf71dd19bc6c759f1ef2ac02a2f6136146989f Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Piotr Kliczewski <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
