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 fa56045
Date Wed, 25 Mar 2015 16:13:37 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 8fe3c0b8b -> fa5604566


findbugs: wrapper object comparison (fixed)

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

Branch: refs/heads/master
Commit: fa56045665f07e8c9bc0e624802546527d833374
Parents: 8fe3c0b
Author: Daan Hoogland <dhoogland@schubergphilis.com>
Authored: Wed Mar 25 17:12:51 2015 +0100
Committer: Daan Hoogland <dhoogland@schubergphilis.com>
Committed: Wed Mar 25 17:12:51 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/fa560456/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 dec6150..3426a0a 100644
--- a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
+++ b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -1768,7 +1768,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)) {
                     final Long destClusterId = destPool.getClusterId();
-                    if (srcClusterId != null && destClusterId != null &&
srcClusterId != destClusterId) {
+                    if (srcClusterId != null && destClusterId != null &&
! srcClusterId.equals(destClusterId)) {
                         final String srcDcName = _clusterDetailsDao.getVmwareDcName(srcClusterId);
                         final String destDcName = _clusterDetailsDao.getVmwareDcName(destClusterId);
                         if (srcDcName != null && destDcName != null && !srcDcName.equals(destDcName))
{


Mime
View raw message