You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2014/06/20 18:41:03 UTC

git commit: Allow setting the UseAsyn flag via a string to make it easier to set via spring/blueprint

Repository: cxf
Updated Branches:
  refs/heads/master b522a8107 -> 4150c1dd1


Allow setting the UseAsyn flag via a string to make it easier to set via spring/blueprint


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/4150c1dd
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/4150c1dd
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/4150c1dd

Branch: refs/heads/master
Commit: 4150c1dd1545fcc4f5d77cfb0d1a86dbea936ca7
Parents: b522a81
Author: Daniel Kulp <dk...@apache.org>
Authored: Fri Jun 20 12:31:33 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Jun 20 12:31:59 2014 -0400

----------------------------------------------------------------------
 .../apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java   | 3 +++
 .../apache/cxf/transport/http/netty/client/NettyHttpConduit.java  | 3 +++
 2 files changed, 6 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/4150c1dd/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 e09cb14..a7e7dcc 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
@@ -149,6 +149,9 @@ public class AsyncHTTPConduit extends URLConnectionHTTPConduit {
         if (o == null) {
             o = factory.getUseAsyncPolicy();
         }
+        if (o instanceof String) {
+            o = UseAsyncPolicy.valueOf(o.toString().toUpperCase());
+        }
         if (o instanceof UseAsyncPolicy) {
             switch ((UseAsyncPolicy)o) {
             case ALWAYS:

http://git-wip-us.apache.org/repos/asf/cxf/blob/4150c1dd/rt/transports/http-netty/netty-client/src/main/java/org/apache/cxf/transport/http/netty/client/NettyHttpConduit.java
----------------------------------------------------------------------
diff --git a/rt/transports/http-netty/netty-client/src/main/java/org/apache/cxf/transport/http/netty/client/NettyHttpConduit.java b/rt/transports/http-netty/netty-client/src/main/java/org/apache/cxf/transport/http/netty/client/NettyHttpConduit.java
index 583087f..6ad870e 100644
--- a/rt/transports/http-netty/netty-client/src/main/java/org/apache/cxf/transport/http/netty/client/NettyHttpConduit.java
+++ b/rt/transports/http-netty/netty-client/src/main/java/org/apache/cxf/transport/http/netty/client/NettyHttpConduit.java
@@ -113,6 +113,9 @@ public class NettyHttpConduit extends URLConnectionHTTPConduit implements BusLif
         if (o == null) {
             o = factory.getUseAsyncPolicy();
         }
+        if (o instanceof String) {
+            o = NettyHttpConduitFactory.UseAsyncPolicy.valueOf(o.toString().toUpperCase());
+        }
         if (o instanceof NettyHttpConduitFactory.UseAsyncPolicy) {
             switch ((NettyHttpConduitFactory.UseAsyncPolicy)o) {
             case ALWAYS: