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 6214E10BF4 for ; Tue, 28 Jan 2014 22:22:44 +0000 (UTC) Received: (qmail 93867 invoked by uid 500); 28 Jan 2014 22:22:40 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 93735 invoked by uid 500); 28 Jan 2014 22:22:40 -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 93261 invoked by uid 99); 28 Jan 2014 22:22:39 -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 22:22:38 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 22A4F90ADF4; Tue, 28 Jan 2014 22:22:38 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: animesh@apache.org To: commits@cloudstack.apache.org Date: Tue, 28 Jan 2014 22:22:38 -0000 Message-Id: <79302ba557e744a3ac99ecd3c77bb819@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] git commit: updated refs/heads/4.3 to 220a2a1 Updated Branches: refs/heads/4.3 fd391845c -> 220a2a1a0 Findbugs finding : Incorrect use of equality (cherry picked from commit 10cc5645e8b9713bc7c86d543413d396ce203cc6) (cherry picked from commit f18c5a1910b6370585a1d61638b8310c3ecba5ef) Signed-off-by: Animesh Chaturvedi Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1be40d69 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1be40d69 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1be40d69 Branch: refs/heads/4.3 Commit: 1be40d69265096597f8420f64596a6da9ec7d5dc Parents: fd39184 Author: Hugo Trippaers Authored: Fri Jan 24 11:58:53 2014 +0000 Committer: Animesh Chaturvedi Committed: Tue Jan 28 14:12:10 2014 -0800 ---------------------------------------------------------------------- .../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/1be40d69/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);