Author: dkulp
Date: Wed Jul 11 16:19:54 2012
New Revision: 1360266
URL: http://svn.apache.org/viewvc?rev=1360266&view=rev
Log:
Merged revisions 1360262 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1360262 | dkulp | 2012-07-11 12:17:06 -0400 (Wed, 11 Jul 2012) | 2 lines
[CXF-4417] add settings for async control to osgi settings
........
Modified:
cxf/branches/2.6.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/osgi/HTTPTransportActivator.java
Modified:
cxf/branches/2.6.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/osgi/HTTPTransportActivator.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/osgi/HTTPTransportActivator.java?rev=1360266&r1=1360265&r2=1360266&view=diff
==============================================================================
---
cxf/branches/2.6.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/osgi/HTTPTransportActivator.java
(original)
+++
cxf/branches/2.6.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/osgi/HTTPTransportActivator.java
Wed Jul 11 16:19:54 2012
@@ -513,6 +513,10 @@ public class HTTPTransportActivator
p.setConnectionTimeout(Long.parseLong(v.trim()));
} else if ("ReceiveTimeout".equals(k)) {
p.setReceiveTimeout(Long.parseLong(v.trim()));
+ } else if ("AsyncExecuteTimeout".equals(k)) {
+ p.setAsyncExecuteTimeout(Long.parseLong(v.trim()));
+ } else if ("AsyncExecuteTimeoutRejection".equals(k)) {
+
p.setAsyncExecuteTimeoutRejection(Boolean.parseBoolean(v.trim()));
} else if ("AutoRedirect".equals(k)) {
p.setAutoRedirect(Boolean.parseBoolean(v.trim()));
} else if ("MaxRetransmits".equals(k)) {
