Repository: cloudstack Updated Branches: refs/heads/master ec0179193 -> 5e4a4e8b3
Fix a regression that caused API job to return prematurely. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5e4a4e8b Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5e4a4e8b Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5e4a4e8b Branch: refs/heads/master Commit: 5e4a4e8b347a18c8e42efe170fe1c67db5bc9c94 Parents: ec01791 Author: Kelven Yang <kelv...@gmail.com> Authored: Fri Mar 14 16:33:18 2014 -0700 Committer: Kelven Yang <kelv...@gmail.com> Committed: Fri Mar 14 17:31:16 2014 -0700 ---------------------------------------------------------------------- .../orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5e4a4e8b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java ---------------------------------------------------------------------- diff --git a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java index ae882bf..bd1a754 100755 --- a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java +++ b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java @@ -4407,8 +4407,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac @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; }
