You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@jmeter.apache.org by pm...@apache.org on 2016/02/17 11:44:17 UTC

svn commit: r1730809 - /jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/HC4TrustAllSSLSocketFactory.java

Author: pmouawad
Date: Wed Feb 17 10:44:17 2016
New Revision: 1730809

URL: http://svn.apache.org/viewvc?rev=1730809&view=rev
Log:
Fix unused factory in second constructor protected HC4TrustAllSSLSocketFactory(javax.net.ssl.SSLSocketFactory factory)

Modified:
    jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/HC4TrustAllSSLSocketFactory.java

Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/HC4TrustAllSSLSocketFactory.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/HC4TrustAllSSLSocketFactory.java?rev=1730809&r1=1730808&r2=1730809&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/HC4TrustAllSSLSocketFactory.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/HC4TrustAllSSLSocketFactory.java Wed Feb 17 10:44:17 2016
@@ -63,7 +63,7 @@ public class HC4TrustAllSSLSocketFactory
      */
     protected HC4TrustAllSSLSocketFactory(javax.net.ssl.SSLSocketFactory factory) throws GeneralSecurityException {
         super(TRUSTALL, SSLSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER);
-        this.factory = new HttpSSLProtocolSocketFactory((JsseSSLManager)JsseSSLManager.getInstance(), JsseSSLManager.CPS);
+        this.factory = factory;
     }
 
     /* (non-Javadoc)