Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D7CBE10BED for ; Tue, 28 Jan 2014 09:00:24 +0000 (UTC) Received: (qmail 19156 invoked by uid 500); 28 Jan 2014 09:00:24 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 18930 invoked by uid 500); 28 Jan 2014 09:00:23 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 18911 invoked by uid 99); 28 Jan 2014 09:00:22 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 28 Jan 2014 09:00:22 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id F3C00909667; Tue, 28 Jan 2014 09:00:21 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: hugo@apache.org To: commits@cloudstack.apache.org Date: Tue, 28 Jan 2014 09:00:22 -0000 Message-Id: <98d0b099d15340e89c9244a0941b8169@git.apache.org> In-Reply-To: <0b2f58547cc24dc4bbe48b0701ff1b8b@git.apache.org> References: <0b2f58547cc24dc4bbe48b0701ff1b8b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: updated refs/heads/master to 3bd38eb Findbugs finding : Incorrect use of equality Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3bd38eb1 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3bd38eb1 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3bd38eb1 Branch: refs/heads/master Commit: 3bd38eb17e4b51bd57e3db2d204105387bfdc7a8 Parents: cc98125 Author: Hugo Trippaers Authored: Fri Jan 24 11:58:53 2014 +0000 Committer: Hugo Trippaers Committed: Tue Jan 28 08:58:28 2014 +0000 ---------------------------------------------------------------------- .../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/3bd38eb1/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 3cd7a9f..e6ecbc9 100755 --- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java +++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java @@ -166,7 +166,7 @@ public class VmwareServerDiscoverer extends DiscovererBase implements Discoverer _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);