Arik Hadas has uploaded a new change for review. Change subject: core: fix possible NPE on run/migrate commands ......................................................................
core: fix possible NPE on run/migrate commands In some cases we might reach the runningFailed method when no host was selected by the scheduler, so we could get NPE when trying to decrease the pending memory. So null-check is added. Change-Id: I664b2aaabc855ed3b28a9b8fdee64d32c4191e65 Bug-Url: https://bugzilla.redhat.com/1220285 Signed-off-by: Arik Hadas <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommandBase.java 1 file changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/11/41411/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommandBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommandBase.java index eb33738..15589f4 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommandBase.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommandBase.java @@ -27,6 +27,7 @@ import org.ovirt.engine.core.common.businessentities.LUNs; import org.ovirt.engine.core.common.businessentities.LunDisk; import org.ovirt.engine.core.common.businessentities.StorageServerConnections; +import org.ovirt.engine.core.common.businessentities.VDS; import org.ovirt.engine.core.common.businessentities.VM; import org.ovirt.engine.core.common.businessentities.VMStatus; import org.ovirt.engine.core.common.businessentities.VmStatic; @@ -231,7 +232,7 @@ @Override public void run() { for (Guid vdsId : getRunVdssList()) { - if (!getCurrentVdsId().equals(vdsId)) { + if (!vdsId.equals(getCurrentVdsId())) { Backend.getInstance().getResourceManager() .RunVdsCommand(VDSCommandType.FailedToRunVm, new FailedToRunVmVDSCommandParameters(vdsId)); } @@ -279,7 +280,8 @@ } protected Guid getCurrentVdsId() { - return getVds().getId(); + VDS vds = getVds(); + return vds != null ? vds.getId() : null; } @Override -- To view, visit https://gerrit.ovirt.org/41411 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I664b2aaabc855ed3b28a9b8fdee64d32c4191e65 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: Arik Hadas <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
