Amit Aviram has uploaded a new change for review.

Change subject: core: NPE fix in clone image from snapshot
......................................................................

core: NPE fix in clone image from snapshot

NPE is thrown from AddVmFromSnapshotCommand's CDA. This is caused
because destStorages is filled with its domains only in the super's
CDA- which is being called at the end of the function.

This patch puts the call to super.CDA before the usage of destStorages.

* Later on, this will be refactored, this patch is a fast fix for 3.5.3
build.

Change-Id: Ib1c412298c017bd1dad6ee1248933907139d82e3
Bug-Url: https://bugzilla.redhat.com/1215845
Signed-off-by: Amit Aviram <aavi...@redhat.com>
---
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromSnapshotCommand.java
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/53/40753/1

diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromSnapshotCommand.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromSnapshotCommand.java
index 027042d..c777ded 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromSnapshotCommand.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromSnapshotCommand.java
@@ -148,11 +148,11 @@
             return false;
         }
 
-        if (!checkCanDisableVirtIoScsi()) {
+        if (!super.canDoAction()) {
             return false;
         }
 
-        if (!super.canDoAction()) {
+        if (!checkCanDisableVirtIoScsi()) {
             return false;
         }
 


-- 
To view, visit https://gerrit.ovirt.org/40753
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib1c412298c017bd1dad6ee1248933907139d82e3
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.5.3
Gerrit-Owner: Amit Aviram <aavi...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches

Reply via email to