hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r1539286 - in /httpcomponents/httpclient/trunk: RELEASE_NOTES.txt httpclient/src/main/java-deprecated/org/apache/http/impl/conn/DefaultClientConnectionOperator.java
Date Wed, 06 Nov 2013 09:24:33 GMT
Author: olegk
Date: Wed Nov  6 09:24:33 2013
New Revision: 1539286

URL: http://svn.apache.org/r1539286
Log:
HTTPCLIENT-1431: (Regression) deprecated connection manager cannot be used witha custom LayeredSchemeSocketFactory

Modified:
    httpcomponents/httpclient/trunk/RELEASE_NOTES.txt
    httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/DefaultClientConnectionOperator.java

Modified: httpcomponents/httpclient/trunk/RELEASE_NOTES.txt
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/RELEASE_NOTES.txt?rev=1539286&r1=1539285&r2=1539286&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/RELEASE_NOTES.txt (original)
+++ httpcomponents/httpclient/trunk/RELEASE_NOTES.txt Wed Nov  6 09:24:33 2013
@@ -1,6 +1,10 @@
 Changes since 4.3.1
 -------------------
 
+* [HTTPCLIENT-1431] (Regression) deprecated connection manager cannot be used with
+  a custom LayeredSchemeSocketFactory.
+  Contributed by Oleg Kalnichevski <olegk at apache.org>
+
 * [HTTPCLIENT-1425] Fixed socket closed exception thrown by caching HttpClient when the origin

   server sends a long chunked response.
   Contributed by James Leigh <james at 3roundstones dot com>

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/DefaultClientConnectionOperator.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/DefaultClientConnectionOperator.java?rev=1539286&r1=1539285&r2=1539286&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/DefaultClientConnectionOperator.java
(original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/DefaultClientConnectionOperator.java
Wed Nov  6 09:24:33 2013
@@ -48,7 +48,6 @@ import org.apache.http.conn.scheme.Schem
 import org.apache.http.conn.scheme.SchemeLayeredSocketFactory;
 import org.apache.http.conn.scheme.SchemeRegistry;
 import org.apache.http.conn.scheme.SchemeSocketFactory;
-import org.apache.http.conn.socket.LayeredConnectionSocketFactory;
 import org.apache.http.params.HttpConnectionParams;
 import org.apache.http.params.HttpParams;
 import org.apache.http.protocol.HttpContext;
@@ -211,7 +210,7 @@ public class DefaultClientConnectionOper
 
         final SchemeRegistry registry = getSchemeRegistry(context);
         final Scheme schm = registry.getScheme(target.getSchemeName());
-        Asserts.check(schm.getSchemeSocketFactory() instanceof LayeredConnectionSocketFactory,
+        Asserts.check(schm.getSchemeSocketFactory() instanceof SchemeLayeredSocketFactory,
             "Socket factory must implement SchemeLayeredSocketFactory");
         final SchemeLayeredSocketFactory lsf = (SchemeLayeredSocketFactory) schm.getSchemeSocketFactory();
         final Socket sock = lsf.createLayeredSocket(



Mime
View raw message