svn commit: r1731172 - /jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/LazySchemeSocketFactory.java

[pmouawad]

Author: pmouawad
Date: Thu Feb 18 23:44:53 2016
New Revision: 1731172

URL: http://svn.apache.org/viewvc?rev=1731172&view=rev
Log:
Bug 58099 - Performance : Lazily initialize HttpClient SSL Context to avoid its 
initialization even for HTTP only scenarios
Fix regression on HTTPS tests, No route to host...
Bugzilla Id: 58099

Modified:
    
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/LazySchemeSocketFactory.java

Modified: 
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/LazySchemeSocketFactory.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/LazySchemeSocketFactory.java?rev=1731172&r1=1731171&r2=1731172&view=diff
==============================================================================
--- 
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/LazySchemeSocketFactory.java
 (original)
+++ 
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/LazySchemeSocketFactory.java
 Thu Feb 18 23:44:53 2016
@@ -25,7 +25,7 @@ import java.net.UnknownHostException;
 import java.security.GeneralSecurityException;
 
 import org.apache.http.conn.ConnectTimeoutException;
-import org.apache.http.conn.scheme.SchemeSocketFactory;
+import org.apache.http.conn.scheme.SchemeLayeredSocketFactory;
 import org.apache.http.conn.ssl.SSLInitializationException;
 import org.apache.http.conn.ssl.SSLSocketFactory;
 import org.apache.http.params.HttpParams;
@@ -37,10 +37,10 @@ import org.apache.log.Logger;
  * Lazy SchemeSocketFactory that lazily initializes HTTPS Socket Factory
  * @since 3.0
  */
-public final class LazySchemeSocketFactory implements SchemeSocketFactory{
+public final class LazySchemeSocketFactory implements 
SchemeLayeredSocketFactory{
     private static final Logger LOG = LoggingManager.getLoggerForClass();
     
-    private volatile SchemeSocketFactory adaptee;
+    private volatile SchemeLayeredSocketFactory adaptee;
     
     /**
      * 
@@ -110,4 +110,17 @@ public final class LazySchemeSocketFacto
         checkAndInit();
         return adaptee.isSecure(sock);
     }
+
+    /**
+     * @param socket {@link Socket}
+     * @param target 
+     * @param port 
+     * @param params {@link HttpParams}
+     */
+    @Override
+    public Socket createLayeredSocket(Socket socket, String target, int port,
+            HttpParams params) throws IOException, UnknownHostException {
+        checkAndInit();
+        return adaptee.createLayeredSocket(socket, target, port, params);
+    }
 }