You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by hu...@apache.org on 2014/01/25 10:52:19 UTC
[3/3] git commit: updated refs/heads/4.3-forward to c307de3
Findbugs finding : Incorrect use of equality
(cherry picked from commit 10cc5645e8b9713bc7c86d543413d396ce203cc6)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f18c5a19
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f18c5a19
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f18c5a19
Branch: refs/heads/4.3-forward
Commit: f18c5a1910b6370585a1d61638b8310c3ecba5ef
Parents: 81a83b5
Author: Hugo Trippaers <ht...@schubergphilis.com>
Authored: Fri Jan 24 11:58:53 2014 +0000
Committer: Hugo Trippaers <ht...@schubergphilis.com>
Committed: Sat Jan 25 10:52:09 2014 +0100
----------------------------------------------------------------------
.../src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f18c5a19/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java
index 89bbeb9..54e9815 100755
--- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java
@@ -168,7 +168,7 @@ public class VmwareServerDiscoverer extends DiscovererBase implements
_clusterDetailsDao.persist(clusterId, clusterDetails);
}
String updatedInventoryPath = validateCluster(url, vmwareDc);
- if (url.getPath() != updatedInventoryPath) {
+ if (!url.getPath().equals(updatedInventoryPath)) {
// If url from API doesn't specify DC then update url in database with DC associated with this zone.
clusterDetails.put("url", url.getScheme() + "://" + url.getHost() + updatedInventoryPath);
_clusterDetailsDao.persist(clusterId, clusterDetails);