Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/http
In directory vz-cvs-3.sog:/tmp/cvs-serv21778/src/org/sblim/cimclient/internal/http
Modified Files:
Tag: Experimental
HttpClient.java
Log Message:
3323310 - Need the ability to override certain Global Properties
Index: HttpClient.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/http/HttpClient.java,v
retrieving revision 1.12.2.24
retrieving revision 1.12.2.25
diff -u -d -r1.12.2.24 -r1.12.2.25
--- HttpClient.java 23 Mar 2011 15:48:08 -0000 1.12.2.24
+++ HttpClient.java 20 Jun 2011 23:28:56 -0000 1.12.2.25
@@ -58,6 +58,7 @@
* 3046073 2010-09-07 blaschke-oss Performance hit due to socket conn. creation with timeout
* 3195069 2011-02-28 blaschke-oss Need support to disable SSL Handshake
* 3235440 2011-03-22 blaschke-oss NullPointerException when socket factory returns null
+ * 3323310 2011-06-20 blaschke-oss Need the ability to override certain Global Properties
*/
package org.sblim.cimclient.internal.http;
@@ -97,7 +98,6 @@
import org.sblim.cimclient.internal.http.io.PersistentInputStream;
import org.sblim.cimclient.internal.logging.LogAndTraceBroker;
import org.sblim.cimclient.internal.logging.Messages;
-import org.sblim.cimclient.internal.util.WBEMConfiguration;
import org.sblim.cimclient.internal.util.WBEMConstants;
/**
@@ -958,7 +958,7 @@
if (this.iSocket == null) {
// Determine whether we need to connect with a timeout or not
- boolean socketConnectWithTimeout = WBEMConfiguration.getGlobalConfiguration()
+ boolean socketConnectWithTimeout = this.iHttpClientPool.getConfigurationContext()
.socketConnectWithTimeout();
logger.trace(Level.FINER, "Socket=null, creating http socket "
+ (socketConnectWithTimeout ? "with" : "without") + " timeout.");
@@ -1033,7 +1033,7 @@
// Determine whether we need to perform synchronized SSL
// handshake or not
- boolean synchronizedHandshake = WBEMConfiguration.getGlobalConfiguration()
+ boolean synchronizedHandshake = this.iHttpClientPool.getConfigurationContext()
.synchronizedSslHandshake();
logger.trace(Level.FINER, "Starting "
+ (synchronizedHandshake ? "synchronized" : "unsynchronized")
|
