cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ff...@apache.org
Subject [cxf] branch master updated: [CXF-7623]extend HTTPClientPolicy to support the ConnectionRequestTimeout configuration from connection pool manager
Date Thu, 01 Feb 2018 06:40:22 GMT
This is an automated email from the ASF dual-hosted git repository.

ffang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git


The following commit(s) were added to refs/heads/master by this push:
     new eb6a31a  [CXF-7623]extend HTTPClientPolicy to support the ConnectionRequestTimeout
configuration from connection pool manager
eb6a31a is described below

commit eb6a31ae9e193e5adfb9b4efebc43bff658de43c
Author: Freeman Fang <freeman.fang@gmail.com>
AuthorDate: Thu Feb 1 14:40:08 2018 +0800

    [CXF-7623]extend HTTPClientPolicy to support the ConnectionRequestTimeout configuration
from connection pool manager
---
 .../apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java   | 2 +-
 rt/transports/http/src/main/resources/schemas/wsdl/http-conf.xsd  | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

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 0100452..d98728b 100755
--- 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
@@ -220,7 +220,7 @@ public class AsyncHTTPConduit extends URLConnectionHTTPConduit {
         RequestConfig.Builder b = RequestConfig.custom()
                 .setConnectTimeout((int) csPolicy.getConnectionTimeout())
                 .setSocketTimeout((int) csPolicy.getReceiveTimeout())
-                .setConnectionRequestTimeout((int) csPolicy.getReceiveTimeout());
+                .setConnectionRequestTimeout((int) csPolicy.getConnectionRequestTimeout());
         Proxy p = proxyFactory.createProxy(csPolicy, uri);
         if (p != null && p.type() != Proxy.Type.DIRECT) {
             InetSocketAddress isa = (InetSocketAddress)p.address();
diff --git a/rt/transports/http/src/main/resources/schemas/wsdl/http-conf.xsd b/rt/transports/http/src/main/resources/schemas/wsdl/http-conf.xsd
index a5bf513..0109368 100644
--- a/rt/transports/http/src/main/resources/schemas/wsdl/http-conf.xsd
+++ b/rt/transports/http/src/main/resources/schemas/wsdl/http-conf.xsd
@@ -178,6 +178,14 @@
             </xs:annotation>      
         </xs:attribute>
 
+        <xs:attribute name="ConnectionRequestTimeout" type="ptp:ParameterizedUInt" use="optional"
default="60000">
+            <xs:annotation>
+                <xs:documentation>
+                Specifies the amount of time, in milliseconds, used when requesting a connection
from the connection manager(if appliable). 0 is infinite.
+                </xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
+
         <xs:attribute name="AsyncExecuteTimeout" type="ptp:ParameterizedUInt" use="optional"
default="5000">
             <xs:annotation>
                 <xs:documentation>

-- 
To stop receiving notification emails like this one, please contact
ffang@apache.org.

Mime
View raw message