Repository: cxf Updated Branches: refs/heads/3.0.x-fixes e2c3aa70f -> f9d8717a6
[CXF-6910]don't need setSocketTimeout when create ahc RequestConfig (cherry picked from commit c681373b5068326d272a46b59e2e9394f94e95ec) (cherry picked from commit fbfd097a19162ec1a2b81985ca8ff4747307497e) Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/f9d8717a Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f9d8717a Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f9d8717a Branch: refs/heads/3.0.x-fixes Commit: f9d8717a6daf05a6e05492d7a55d85411dabd2b5 Parents: e2c3aa7 Author: Freeman Fang <[email protected]> Authored: Fri May 20 09:58:07 2016 +0800 Committer: Freeman Fang <[email protected]> Committed: Fri May 20 10:00:17 2016 +0800 ---------------------------------------------------------------------- .../org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java | 1 - 1 file changed, 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/f9d8717a/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java ---------------------------------------------------------------------- diff --git a/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java b/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java index f70dbb8..c8b9478 100644 --- a/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java +++ b/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java @@ -218,7 +218,6 @@ public class AsyncHTTPConduit extends URLConnectionHTTPConduit { e.setEntity(entity); RequestConfig.Builder b = RequestConfig.custom() - .setSocketTimeout((int) csPolicy.getReceiveTimeout()) .setConnectTimeout((int) csPolicy.getConnectionTimeout()); Proxy p = proxyFactory.createProxy(csPolicy , uri); if (p != null && p.type() != Proxy.Type.DIRECT) {
