[Engine-patches] Change in ovirt-engine[master]: core: ImportVm cleanup - unwrap else blcoks

[amureini]

Allon Mureinik has uploaded a new change for review.

Change subject: core: ImportVm cleanup - unwrap else blcoks
......................................................................

core: ImportVm cleanup - unwrap else blcoks

Unwrapped useless else block when execution does not continue after the
if block (e.g., the if block has a return or break statement).

Change-Id: Ice993e9c0a1ce8275a43b8277ddf9574590ee290
Signed-off-by: Allon Mureinik <amure...@redhat.com>
---
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java
1 file changed, 13 insertions(+), 16 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/11/9611/1

diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java
index c33c446..0f505c3 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java
@@ -14,9 +14,9 @@
 import org.ovirt.engine.core.bll.command.utils.StorageDomainSpaceChecker;
 import org.ovirt.engine.core.bll.job.ExecutionHandler;
 import org.ovirt.engine.core.bll.network.VmInterfaceManager;
-import org.ovirt.engine.core.bll.quota.QuotaStorageDependent;
-import org.ovirt.engine.core.bll.quota.QuotaStorageConsumptionParameter;
 import org.ovirt.engine.core.bll.quota.QuotaConsumptionParameter;
+import org.ovirt.engine.core.bll.quota.QuotaStorageConsumptionParameter;
+import org.ovirt.engine.core.bll.quota.QuotaStorageDependent;
 import org.ovirt.engine.core.bll.snapshots.SnapshotsManager;
 import org.ovirt.engine.core.bll.utils.PermissionSubject;
 import org.ovirt.engine.core.bll.utils.VmDeviceUtils;
@@ -117,17 +117,15 @@
     public Guid getVmId() {
         if (getParameters().isImportAsNewEntity()) {
             return getParameters().getVm().getId();
-        } else {
-            return super.getVmId();
         }
+        return super.getVmId();
     }
     @Override
     public VM getVm() {
         if (getParameters().isImportAsNewEntity()) {
             return getParameters().getVm();
-        } else {
-            return super.getVm();
         }
+        return super.getVm();
     }
 
     @Override
@@ -174,9 +172,9 @@
                         || 
!validator.domainIsValidDestination(canDoActionMessages)) {
                     retVal = false;
                     break;
-                } else {
-                    domainsMap.put(destGuid, storageDomain);
                 }
+
+                domainsMap.put(destGuid, storageDomain);
             }
         }
 
@@ -244,15 +242,14 @@
                         }
                         if (!retVal) {
                             break;
-                        } else {
-                            
image.setstorage_pool_id(getParameters().getStoragePoolId());
-                            // we put the source domain id in order that copy 
will
-                            // work
-                            // ok
-                            // we fix it to DestDomainId in
-                            // MoveOrCopyAllImageGroups();
-                            image.setstorage_ids(new 
ArrayList<Guid>(Arrays.asList(getParameters().getSourceDomainId())));
                         }
+
+                        
image.setstorage_pool_id(getParameters().getStoragePoolId());
+                        // we put the source domain id in order that copy will
+                        // work properly.
+                        // we fix it to DestDomainId in
+                        // MoveOrCopyAllImageGroups();
+                        image.setstorage_ids(new 
ArrayList<Guid>(Arrays.asList(getParameters().getSourceDomainId())));
                     }
                     if (retVal) {
                         Map<Guid, List<DiskImage>> images = 
getImagesLeaf(getVm().getImages());


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

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