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/11/14 17:27:45 UTC
[5/6] cxf git commit: Make sure the netty client is optional can can
not cause failures if netty isn't found
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/e99a4e29
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e99a4e29
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e99a4e29
Branch: refs/heads/3.0.x-fixes
Commit: e99a4e29176f781aa6f6fd281fcf86fe4eacb0b0
Parents: fcaf003
Author: Daniel Kulp <dk...@apache.org>
Authored: Thu Nov 13 11:48:53 2014 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Nov 14 11:27:25 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/e99a4e29/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/e99a4e29/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