jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmoua...@apache.org
Subject svn commit: r1654424 - in /jmeter/trunk: src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java xdocs/changes.xml
Date Fri, 23 Jan 2015 22:48:19 GMT
Author: pmouawad
Date: Fri Jan 23 22:48:19 2015
New Revision: 1654424

URL: http://svn.apache.org/r1654424
Log:
Bug 57488 - Performance : Improve SSLContext reset for Two-way SSL Authentication
Bugzilla Id: 57488

Modified:
    jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java
    jmeter/trunk/xdocs/changes.xml

Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java?rev=1654424&r1=1654423&r2=1654424&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java
(original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java
Fri Jan 23 22:48:19 2015
@@ -36,6 +36,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
 
 import javax.security.auth.Subject;
 
@@ -123,7 +124,6 @@ import org.apache.jmeter.util.JsseSSLMan
 import org.apache.jmeter.util.SSLManager;
 import org.apache.jorphan.logging.LoggingManager;
 import org.apache.log.Logger;
-import org.htmlparser.http.ConnectionManager;
 
 /**
  * HTTP Sampler using Apache HttpClient 4.x.
@@ -640,7 +640,7 @@ public class HTTPHC4Impl extends HTTPHCA
         if (httpClient != null && resetSSLContext && HTTPConstants.PROTOCOL_HTTPS.equalsIgnoreCase(url.getProtocol()))
{
             ((AbstractHttpClient) httpClient).clearRequestInterceptors(); 
             ((AbstractHttpClient) httpClient).clearResponseInterceptors(); 
-            httpClient.getConnectionManager().shutdown();
+            httpClient.getConnectionManager().closeIdleConnections(1L, TimeUnit.MICROSECONDS);
             httpClient = null;
             JsseSSLManager sslMgr = (JsseSSLManager) SSLManager.getInstance();
             sslMgr.resetContext();

Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1654424&r1=1654423&r2=1654424&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Fri Jan 23 22:48:19 2015
@@ -187,6 +187,7 @@ See  <bugzilla>56357</bugzilla> for deta
 <ul>
 <li><bug>25430</bug>HTTP(S) Test Script Recorder : Make it populate HTTP
Authorisation Manager. Partly based on a patch from Dzmitry Kashlach (dzmitrykashlach at gmail.com)</li>
 <li><bug>57381</bug>HTTP(S) Test Script Recorder should display an error
if Target Controller references a Recording Controller and no Recording Controller exists.
Contributed by Ubik Load Pack (support at ubikloadpack.com)</li>
+<li><bug>57488</bug>Performance : Improve SSLContext reset for Two-way
SSL Authentication</>
 </ul>
 
 <h3>Other samplers</h3>



Mime
View raw message