Gilad Chaplik has uploaded a new change for review.

Change subject: core: NPE when adding detached disk without SD
......................................................................

core: NPE when adding detached disk without SD

Disk Profiles should be checked after verifying SD.

Change-Id: I81e8a487cae33c772b18addc94926babbfe19073
Bug-Url: https://bugzilla.redhat.com/1168525
Signed-off-by: Gilad Chaplik <gchap...@redhat.com>
---
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddDiskCommand.java
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/19/35719/1

diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddDiskCommand.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddDiskCommand.java
index a503d64..700a70d 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddDiskCommand.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddDiskCommand.java
@@ -118,11 +118,11 @@
         }
 
         if (DiskStorageType.IMAGE == 
getParameters().getDiskInfo().getDiskStorageType()) {
-            if (!setAndValidateDiskProfiles()) {
+            if (!checkIfImageDiskCanBeAdded(vm, diskValidator)) {
                 return false;
             }
 
-            return checkIfImageDiskCanBeAdded(vm, diskValidator);
+            return setAndValidateDiskProfiles();
         }
 
         if (DiskStorageType.LUN == 
getParameters().getDiskInfo().getDiskStorageType()) {


-- 
To view, visit http://gerrit.ovirt.org/35719
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I81e8a487cae33c772b18addc94926babbfe19073
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Gilad Chaplik <gchap...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches

Reply via email to