cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject git commit: updated refs/heads/master to 9778481
Date Mon, 03 Feb 2014 19:19:24 GMT
Updated Branches:
  refs/heads/master 5ae12f31b -> 9778481d8


findbugs: handling of long values and wrappers

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

Branch: refs/heads/master
Commit: 9778481d850fa98b62c770821b7c601684c21191
Parents: 5ae12f3
Author: Daan Hoogland <daan@onecht.net>
Authored: Mon Feb 3 20:19:11 2014 +0100
Committer: Daan Hoogland <daan@onecht.net>
Committed: Mon Feb 3 20:19:11 2014 +0100

----------------------------------------------------------------------
 engine/orchestration/src/com/cloud/agent/manager/AgentAttache.java | 2 +-
 .../orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9778481d/engine/orchestration/src/com/cloud/agent/manager/AgentAttache.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/com/cloud/agent/manager/AgentAttache.java b/engine/orchestration/src/com/cloud/agent/manager/AgentAttache.java
index 3c31301..3ebaf4a 100755
--- a/engine/orchestration/src/com/cloud/agent/manager/AgentAttache.java
+++ b/engine/orchestration/src/com/cloud/agent/manager/AgentAttache.java
@@ -130,7 +130,7 @@ public abstract class AgentAttache {
         _maintenance = maintenance;
         _requests = new LinkedList<Request>();
         _agentMgr = agentMgr;
-        _nextSequence = s_rand.nextInt(Short.MAX_VALUE) << 48;
+        _nextSequence = new Long(s_rand.nextInt(Short.MAX_VALUE)) << 48;
         _outstandingTaskCount = new AtomicInteger(0);
     }
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9778481d/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 f3e3c36..8b4433e 100755
--- a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
+++ b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -4236,7 +4236,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements
VirtualMac
                 @Override
                 public boolean checkCondition() {
                     VMInstanceVO instance = _vmDao.findById(vmId);
-                    if (instance.getPowerState() == desiredPowerState && (srcHostIdForMigration
!= null && instance.getPowerHostId() != srcHostIdForMigration))
+                    if (instance.getPowerState() == desiredPowerState && (srcHostIdForMigration
!= null && srcHostIdForMigration.equals(instance.getPowerHostId())))
                         return true;
                     return false;
                 }


Mime
View raw message