You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by mc...@apache.org on 2013/12/06 03:32:43 UTC
git commit: updated refs/heads/4.3 to e33f8f2
Updated Branches:
refs/heads/4.3 80e88dd48 -> e33f8f2f4
Revert "CLOUDSTACK-4950: fix the problem to support sessions to multiple vCenter instance"
This reverts commit ed0fbcc81c1928062054190ffcfab8bb59969cc2.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e33f8f2f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e33f8f2f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e33f8f2f
Branch: refs/heads/4.3
Commit: e33f8f2f44f7cbe81195a8e31f1e977c72ea4f7e
Parents: 80e88dd
Author: Min Chen <mi...@citrix.com>
Authored: Thu Dec 5 18:05:36 2013 -0800
Committer: Min Chen <mi...@citrix.com>
Committed: Thu Dec 5 18:24:29 2013 -0800
----------------------------------------------------------------------
.../src/com/cloud/hypervisor/vmware/util/VmwareClient.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e33f8f2f/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 277b105..2e85f08 100644
--- a/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareClient.java
+++ b/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareClient.java
@@ -88,6 +88,8 @@ public class VmwareClient {
}
};
HttpsURLConnection.setDefaultHostnameVerifier(hv);
+
+ vimService = new VimService();
} catch (Exception e) {
}
}
@@ -105,7 +107,7 @@ public class VmwareClient {
}
private ManagedObjectReference SVC_INST_REF = new ManagedObjectReference();
- private VimService vimService;
+ private static VimService vimService;
private VimPortType vimPort;
private String serviceCookie;
private final String SVC_INST_NAME = "ServiceInstance";
@@ -126,7 +128,6 @@ public class VmwareClient {
SVC_INST_REF.setType(SVC_INST_NAME);
SVC_INST_REF.setValue(SVC_INST_NAME);
- vimService = new VimService();
vimPort = vimService.getVimPort();
Map<String, Object> ctxt = ((BindingProvider) vimPort).getRequestContext();