Repository: cxf Updated Branches: refs/heads/master 3d2e276bb -> 865eb64d4
Make sure the netty client is optional can can not cause failures if netty isn't found Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/e8f57ccf Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e8f57ccf Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e8f57ccf Branch: refs/heads/master Commit: e8f57ccfa5de43e84083f40f8ead640961895e51 Parents: 4505b6b Author: Daniel Kulp <dk...@apache.org> Authored: Thu Nov 13 11:48:53 2014 -0500 Committer: Daniel Kulp <dk...@apache.org> Committed: Thu Nov 13 13:19:43 2014 -0500 ---------------------------------------------------------------------- .../cxf/transport/http/netty/client/NettyHttpConduitFactory.java | 1 + .../src/main/resources/META-INF/cxf/bus-extensions.txt | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/e8f57ccf/rt/transports/http-netty/netty-client/src/main/java/org/apache/cxf/transport/http/netty/client/NettyHttpConduitFactory.java ---------------------------------------------------------------------- diff --git a/rt/transports/http-netty/netty-client/src/main/java/org/apache/cxf/transport/http/netty/client/NettyHttpConduitFactory.java b/rt/transports/http-netty/netty-client/src/main/java/org/apache/cxf/transport/http/netty/client/NettyHttpConduitFactory.java index c07f9bb..a32c66c 100644 --- a/rt/transports/http-netty/netty-client/src/main/java/org/apache/cxf/transport/http/netty/client/NettyHttpConduitFactory.java +++ b/rt/transports/http-netty/netty-client/src/main/java/org/apache/cxf/transport/http/netty/client/NettyHttpConduitFactory.java @@ -67,6 +67,7 @@ public class NettyHttpConduitFactory implements HTTPConduitFactory { UseAsyncPolicy policy; public NettyHttpConduitFactory() { + io.netty.util.Version.identify(); Object st = SystemPropertyAction.getPropertyOrNull(USE_POLICY); policy = UseAsyncPolicy.getPolicy(st); } http://git-wip-us.apache.org/repos/asf/cxf/blob/e8f57ccf/rt/transports/http-netty/netty-client/src/main/resources/META-INF/cxf/bus-extensions.txt ---------------------------------------------------------------------- diff --git a/rt/transports/http-netty/netty-client/src/main/resources/META-INF/cxf/bus-extensions.txt b/rt/transports/http-netty/netty-client/src/main/resources/META-INF/cxf/bus-extensions.txt index 48d5cbd..b63a389 100644 --- a/rt/transports/http-netty/netty-client/src/main/resources/META-INF/cxf/bus-extensions.txt +++ b/rt/transports/http-netty/netty-client/src/main/resources/META-INF/cxf/bus-extensions.txt @@ -1,2 +1,2 @@ org.apache.cxf.transport.http.netty.client.NettyHttpTransportFactory::true -org.apache.cxf.transport.http.netty.client.NettyHttpConduitFactory::true +org.apache.cxf.transport.http.netty.client.NettyHttpConduitFactory::true:true
