gian/cloudstack-mirror
1
0
Fork 0
mirror of https://github.com/apache/cloudstack synced 2026-08-28 08:32:40 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

Merge branch '4.3' of https://git-wip-us.apache.org/repos/asf/cloudstack into 4.3

Browse Source
This commit is contained in:
Frank.Zhang 2013-12-05 22:29:02 -08:00
commit ba894cfe9a
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareClient.java
View File

@ -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();

2
vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareContext.java
View File

@ -100,7 +100,7 @@ public class VmwareContext {
registerOutstandingContext();
if(s_logger.isInfoEnabled())
s_logger.info("New VmwareContext object: " + System.identityHashCode(this) + ", current outstanding count: " + getOutstandingContextCount());
s_logger.info("New VmwareContext object, current outstanding count: " + getOutstandingContextCount());
}
public boolean validate() {

13
vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareContextPool.java
View File

@ -83,9 +83,8 @@ public class VmwareContextPool {
VmwareContext context = l.remove(0);
context.setPoolInfo(this, poolKey);
if(s_logger.isInfoEnabled())
s_logger.info("Return a VmwareContext from the idle pool: " + poolKey + ". current pool size: " + l.size() + ", " +
"outstanding count: " + VmwareContext.getOutstandingContextCount() + ". context: " + System.identityHashCode(context));
if(s_logger.isTraceEnabled())
s_logger.trace("Return a VmwareContext from the idle pool: " + poolKey + ". current pool size: " + l.size() + ", outstanding count: " + VmwareContext.getOutstandingContextCount());
return context;
}
@ -108,11 +107,11 @@ public class VmwareContextPool {
context.clearStockObjects();
l.add(context);
if(s_logger.isInfoEnabled())
s_logger.info("Recycle VmwareContext into idle pool: " + context.getPoolKey() + ", current idle pool size: "
+ l.size() + ", outstanding count: " + VmwareContext.getOutstandingContextCount() + ". context: " + System.identityHashCode(context));
if(s_logger.isTraceEnabled())
s_logger.trace("Recycle VmwareContext into idle pool: " + context.getPoolKey() + ", current idle pool size: "
+ l.size() + ", outstanding count: " + VmwareContext.getOutstandingContextCount());
} else {
if(s_logger.isDebugEnabled())
if(s_logger.isTraceEnabled())
s_logger.trace("VmwareContextPool queue exceeds limits, queue size: " + l.size());
context.close();
}