[Engine-patches] Change in ovirt-engine[master]: core: moved repeated null value check.

[laravot]

Liron Aravot has uploaded a new change for review.

Change subject: core: moved repeated null value check.
......................................................................

core: moved repeated null value check.

The null value check of the relevant disk image repeated itself and
left a chance for an NPE - now it's done within the called method.

Change-Id: I3e4958c9dc108dc6d44e25a5074439e6ec018c12
Signed-off-by: Liron Aravot <lara...@redhat.com>
---
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/BaseImagesCommand.java
1 file changed, 6 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/26/12026/1

diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/BaseImagesCommand.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/BaseImagesCommand.java
index 39251d4..6f651a8 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/BaseImagesCommand.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/BaseImagesCommand.java
@@ -351,8 +351,10 @@
 
     protected void setImageStatus(ImageStatus imageStatus) {
         DiskImage diskImage = getRelevantDiskImage();
-        diskImage.setImageStatus(imageStatus);
-        ImagesHandler.updateImageStatus(diskImage.getImage().getId(), 
imageStatus);
+        if (diskImage != null) {
+            diskImage.setImageStatus(imageStatus);
+            ImagesHandler.updateImageStatus(diskImage.getImage().getId(), 
imageStatus);
+        }
     }
 
     protected DiskImage getRelevantDiskImage() {
@@ -385,10 +387,7 @@
             getImageDao().update(getDestinationDiskImage().getImage());
         }
 
-        if (getRelevantDiskImage() != null) {
-            unLockImage();
-        }
-
+        unLockImage();
         setSucceeded(true);
     }
 
@@ -404,9 +403,7 @@
             removeSnapshot(getDestinationDiskImage());
         }
 
-        if (getRelevantDiskImage() != null) {
-            unLockImage();
-        }
+        unLockImage();
     }
 
     /**


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

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