Liron Ar has uploaded a new change for review. Change subject: core: possible NPE in UpdateVmDisk ......................................................................
core: possible NPE in UpdateVmDisk During UpdateVmDisk command, if the disk doesn't exist anymore in the db the private commands lists won't be initialized causing to NPE on getSharedLocks() method. Change-Id: I787b4a9e723e3096b5d22a5a925cd976940497ff Signed-off-by: Liron Aravot <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmDiskCommand.java 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/39/20639/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmDiskCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmDiskCommand.java index b09c12c..14d7e0b 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmDiskCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmDiskCommand.java @@ -2,6 +2,7 @@ import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.HashMap; import java.util.Iterator; import java.util.LinkedList; @@ -52,7 +53,8 @@ private List<PermissionSubject> listPermissionSubjects; private Map<Guid, List<Disk>> otherVmDisks = new HashMap<Guid, List<Disk>>(); - private List<VM> vmsDiskPluggedTo, vmsDiskSnapshotPluggedTo, vmsDiskOrSnapshotPluggedTo, vmsDiskOrSnapshotAttachedTo; + private List<VM> vmsDiskPluggedTo, vmsDiskSnapshotPluggedTo, vmsDiskOrSnapshotPluggedTo, + vmsDiskOrSnapshotAttachedTo = Collections.emptyList(); /** * vm device for the given vm and disk -- To view, visit http://gerrit.ovirt.org/20639 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I787b4a9e723e3096b5d22a5a925cd976940497ff Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Liron Ar <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
