Fix a regression that caused API job to return prematurely.

kelveny · kelveny · commit 5e4a4e8b347a · 2014-03-14T17:31:16.000-07:00
diff --git a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -4407,8 +4407,7 @@ public VmStateSyncOutcome(final AsyncJob job, final PowerState desiredPowerState
                 @Override
                 public boolean checkCondition() {
                     VMInstanceVO instance = _vmDao.findById(vmId);
-                    if ((instance.getPowerState() == desiredPowerState && srcHostIdForMigration == null) ||
-                            (instance.getPowerState() == desiredPowerState && (srcHostIdForMigration != null && instance.getPowerHostId() != srcHostIdForMigration)))
+                    if (instance.getPowerState() == desiredPowerState && (srcHostIdForMigration != null && instance.getPowerHostId() != srcHostIdForMigration))
                         return true;
                     return false;
                 }
