Sharad Mishra has uploaded a new change for review. Change subject: core: Fix possible NPE in VdsUpdateRunTimeInfo ......................................................................
core: Fix possible NPE in VdsUpdateRunTimeInfo It is possible that vmDynamic is null which could lead to NPE when vmDynamic is called. Added a check for null before using vmDynamic. Signed-off-by: Sharad Mishra <[email protected]> Change-Id: I363780f669b54e1acd844473b2b30e7ae7840136 --- M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java 1 file changed, 4 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/30/9130/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 d0f0dc8..287a59d 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 @@ -1205,9 +1205,10 @@ AddVmStatisticsToList(curVm.getStatisticsData()); AddVmInterfaceStatisticsToList(curVm.getInterfaces()); type = AuditLogType.VM_MIGRATION_ABORT; - logable.AddCustomValue("MigrationError", vmDynamic.getExitMessage()); - - ResourceManager.getInstance().RemoveAsyncRunningVm(vmDynamic.getId()); + if (vmDynamic != null) { + logable.AddCustomValue("MigrationError", vmDynamic.getExitMessage()); + ResourceManager.getInstance().RemoveAsyncRunningVm(vmDynamic.getId()); + } } break; case PoweredDown: { -- To view, visit http://gerrit.ovirt.org/9130 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I363780f669b54e1acd844473b2b30e7ae7840136 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Sharad Mishra <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
