Allon Mureinik has uploaded a new change for review.

Change subject: core: ImagesHandler.setDiskAlias early return
......................................................................

core: ImagesHandler.setDiskAlias early return

Used the early return pattern in ImagesHandler.setDiskAlias to make it
more readable and maintainable.

Change-Id: I69cb7b17e97c86f14eaf64f751183bb5d1b0812a
Signed-off-by: Allon Mureinik <[email protected]>
---
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImagesHandler.java
1 file changed, 10 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/58/9658/1

diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImagesHandler.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImagesHandler.java
index 0c9a85e..db07174 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImagesHandler.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImagesHandler.java
@@ -110,19 +110,19 @@
     }
 
     public static boolean setDiskAlias(BaseDisk disk, VM vm) {
-        if (disk != null) {
-            String vmName = "";
-            int count = 1;
-            if (vm != null) {
-                vmName = vm.getvm_name();
-                count = vm.getDiskMapCount() + 1;
-            }
-            disk.setDiskAlias(getSuggestedDiskAlias(disk, vmName, count));
-            return true;
-        } else {
+        if (disk == null) {
             log.errorFormat("Disk object is null");
             return false;
         }
+
+        String vmName = "";
+        int count = 1;
+        if (vm != null) {
+            vmName = vm.getvm_name();
+            count = vm.getDiskMapCount() + 1;
+        }
+        disk.setDiskAlias(getSuggestedDiskAlias(disk, vmName, count));
+        return true;
     }
 
     /**


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I69cb7b17e97c86f14eaf64f751183bb5d1b0812a
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Allon Mureinik <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches

Reply via email to