cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kelv...@apache.org
Subject git commit: updated refs/heads/master to 4399e24
Date Fri, 14 Mar 2014 00:18:43 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 42d637376 -> 4399e245f


A typo that leads to opposite decision on determine whether or not to notify out-of-band VM
state changes.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4399e245
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4399e245
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4399e245

Branch: refs/heads/master
Commit: 4399e245f4761a6936e3635881db939857850247
Parents: 42d6373
Author: Kelven Yang <kelveny@gmail.com>
Authored: Thu Mar 13 16:55:12 2014 -0700
Committer: Kelven Yang <kelveny@gmail.com>
Committed: Thu Mar 13 17:17:15 2014 -0700

----------------------------------------------------------------------
 .../orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4399e245/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 e344001..e9d2fd2 100755
--- a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
+++ b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -4100,7 +4100,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements
VirtualMac
 
         List<VmWorkJobVO> pendingWorkJobs = _workJobDao.listPendingWorkJobs(
                 VirtualMachine.Type.Instance, vmId);
-        if (pendingWorkJobs.size() == 0 || _haMgr.hasPendingHaWork(vmId)) {
+        if (pendingWorkJobs.size() == 0 || !_haMgr.hasPendingHaWork(vmId)) {
             // there is no pending operation job
             VMInstanceVO vm = _vmDao.findById(vmId);
             if (vm != null) {


Mime
View raw message