CLOUDSTACK-4950: fix the problem to support sessions to multiple vCenter instance

kelveny · kelveny · commit ed0fbcc81c19 · 2013-10-24T11:42:41.000-07:00
diff --git 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 boolean verify(String urlHostName, SSLSession session) {
 	            }
 	        };
 	        HttpsURLConnection.setDefaultHostnameVerifier(hv);
-	        
-        	vimService = new VimService();
 		} catch (Exception e) {
 		}   	
     }
@@ -107,7 +105,7 @@ private static void trustAllHttpsCertificates() throws Exception {
     }
 
     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 void connect(String url, String userName, String password) throws Excepti
         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();
 

Original file line number	Diff line number	Diff line change
`@@ -88,8 +88,6 @@ public boolean verify(String urlHostName, SSLSession session) {`
`88`	`88`	`}`
`89`	`89`	`};`
`90`	`90`	`HttpsURLConnection.setDefaultHostnameVerifier(hv);`
`91`		`-`
`92`		`- vimService = new VimService();`
`93`	`91`	`} catch (Exception e) {`
`94`	`92`	`}`
`95`	`93`	`}`
`@@ -107,7 +105,7 @@ private static void trustAllHttpsCertificates() throws Exception {`
`107`	`105`	`}`
`108`	`106`
`109`	`107`	`private ManagedObjectReference SVC_INST_REF = new ManagedObjectReference();`
`110`		`- private static VimService vimService;`
	`108`	`+ private VimService vimService;`
`111`	`109`	`private VimPortType vimPort;`
`112`	`110`	`private String serviceCookie;`
`113`	`111`	`private final String SVC_INST_NAME = "ServiceInstance";`
`@@ -127,6 +125,7 @@ public void connect(String url, String userName, String password) throws Excepti`
`127`	`125`	`SVC_INST_REF.setType(SVC_INST_NAME);`
`128`	`126`	`SVC_INST_REF.setValue(SVC_INST_NAME);`
`129`	`127`
	`128`	`+ vimService = new VimService();`
`130`	`129`	`vimPort = vimService.getVimPort();`
`131`	`130`	`Map<String, Object> ctxt = ((BindingProvider) vimPort).getRequestContext();`
`132`	`131`