cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject [1/3] git commit: updated refs/heads/master to 43a39d1
Date Thu, 19 Feb 2015 09:29:51 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 6c05d9f57 -> 43a39d1eb


findbugs: equals() call on Long instead of =-comparison

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

Branch: refs/heads/master
Commit: 0f8a055dff8bcd1243af2a70f02b7fb1a92a6f65
Parents: 6c05d9f
Author: Daan Hoogland <daan@onecht.net>
Authored: Thu Feb 19 10:23:10 2015 +0100
Committer: Daan Hoogland <dhoogland@schubergphilis.com>
Committed: Thu Feb 19 10:23:10 2015 +0100

----------------------------------------------------------------------
 .../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/0f8a055d/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 ca60529..a94a83e 100644
--- a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
+++ b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -1761,7 +1761,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements
VirtualMac
                 // unregister the VM from the source host and cleanup the associated VM files.
                 if (vm.getHypervisorType().equals(HypervisorType.VMware)) {
                     Long destClusterId = destPool.getClusterId();
-                    if (srcClusterId != null && destClusterId != null &&
srcClusterId != destClusterId) {
+                    if (srcClusterId != null && destClusterId != null &&
!srcClusterId.equals(destClusterId)) {
                         String srcDcName = _clusterDetailsDao.getVmwareDcName(srcClusterId);
                         String destDcName = _clusterDetailsDao.getVmwareDcName(destClusterId);
                         if (srcDcName != null && destDcName != null && !srcDcName.equals(destDcName))
{


Mime
View raw message