Hello Liron Ar,
I'd like you to do a code review. Please visit
http://gerrit.ovirt.org/20969
to review the following change.
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
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=922475
Signed-off-by: Liron Aravot <[email protected]>
Signed-off-by: Sergey Gotliv <[email protected]>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmDiskCommand.java
1 file changed, 4 insertions(+), 6 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/69/20969/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 0908f88..5d7cef2 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
@@ -52,7 +52,10 @@
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> vmsDiskSnapshotPluggedTo = new LinkedList<>();
+ private List<VM> vmsDiskPluggedTo = new LinkedList<>();
+ private List<VM> vmsDiskOrSnapshotPluggedTo = new LinkedList<>();
+ private List<VM> vmsDiskOrSnapshotAttachedTo = new LinkedList<>();
/**
* vm device for the given vm and disk
@@ -547,11 +550,6 @@
private void loadVmDiskAttachedToInfo() {
if (getOldDisk() != null) {
- vmsDiskSnapshotPluggedTo = new LinkedList<>();
- vmsDiskPluggedTo = new LinkedList<>();
- vmsDiskOrSnapshotPluggedTo = new LinkedList<>();
- vmsDiskOrSnapshotAttachedTo = new LinkedList<>();
-
List<Pair<VM, VmDevice>> attachedVmsInfo =
getVmDAO().getVmsWithPlugInfo(getOldDisk().getId());
for (Pair<VM, VmDevice> pair : attachedVmsInfo) {
VM vm = pair.getFirst();
--
To view, visit http://gerrit.ovirt.org/20969
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I787b4a9e723e3096b5d22a5a925cd976940497ff
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.3
Gerrit-Owner: Sergey Gotliv <[email protected]>
Gerrit-Reviewer: Liron Ar <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches
