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 427ED10E6C for ; Thu, 24 Oct 2013 18:46:57 +0000 (UTC) Received: (qmail 5432 invoked by uid 500); 24 Oct 2013 18:43:14 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 5416 invoked by uid 500); 24 Oct 2013 18:43:11 -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 5237 invoked by uid 99); 24 Oct 2013 18:42:52 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 24 Oct 2013 18:42:52 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 5D55F81C233; Thu, 24 Oct 2013 18:42:52 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: kelveny@apache.org To: commits@cloudstack.apache.org Message-Id: <4d2a5d5f78b64c5da653b1dc82822aee@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/master to ed0fbcc Date: Thu, 24 Oct 2013 18:42:52 +0000 (UTC) Updated Branches: refs/heads/master a1be4fffe -> ed0fbcc81 CLOUDSTACK-4950: fix the problem to support sessions to multiple vCenter instance Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ed0fbcc8 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ed0fbcc8 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ed0fbcc8 Branch: refs/heads/master Commit: ed0fbcc81c1928062054190ffcfab8bb59969cc2 Parents: a1be4ff Author: Kelven Yang Authored: Thu Oct 24 11:41:49 2013 -0700 Committer: Kelven Yang Committed: Thu Oct 24 11:42:41 2013 -0700 ---------------------------------------------------------------------- .../src/com/cloud/hypervisor/vmware/util/VmwareClient.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ed0fbcc8/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareClient.java ---------------------------------------------------------------------- diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareClient.java b/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareClient.java index b20217a..d1adbc2 100644 --- a/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareClient.java +++ b/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareClient.java @@ -88,8 +88,6 @@ public class VmwareClient { } }; HttpsURLConnection.setDefaultHostnameVerifier(hv); - - vimService = new VimService(); } catch (Exception e) { } } @@ -107,7 +105,7 @@ public class VmwareClient { } private ManagedObjectReference SVC_INST_REF = new ManagedObjectReference(); - private static VimService vimService; + private VimService vimService; private VimPortType vimPort; private String serviceCookie; private final String SVC_INST_NAME = "ServiceInstance"; @@ -127,6 +125,7 @@ public class VmwareClient { SVC_INST_REF.setType(SVC_INST_NAME); SVC_INST_REF.setValue(SVC_INST_NAME); + vimService = new VimService(); vimPort = vimService.getVimPort(); Map ctxt = ((BindingProvider) vimPort).getRequestContext();