cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject svn commit: r1503626 - /cxf/trunk/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngineFactory.java
Date Tue, 16 Jul 2013 09:23:30 GMT
Author: ay
Date: Tue Jul 16 09:23:29 2013
New Revision: 1503626

URL: http://svn.apache.org/r1503626
Log:
analogue fix for netty for cxf-5119

Modified:
    cxf/trunk/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngineFactory.java

Modified: cxf/trunk/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngineFactory.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngineFactory.java?rev=1503626&r1=1503625&r2=1503626&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngineFactory.java
(original)
+++ cxf/trunk/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngineFactory.java
Tue Jul 16 09:23:29 2013
@@ -32,10 +32,12 @@ import javax.annotation.Resource;
 import org.apache.cxf.Bus;
 import org.apache.cxf.buslifecycle.BusLifeCycleListener;
 import org.apache.cxf.buslifecycle.BusLifeCycleManager;
+import org.apache.cxf.common.injection.NoJSR250Annotations;
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.configuration.jsse.TLSServerParameters;
 
 
+@NoJSR250Annotations(unlessNull = "bus")
 public class NettyHttpServerEngineFactory implements BusLifeCycleListener {
     private static final Logger LOG =
             LogUtils.getL7dLogger(NettyHttpServerEngineFactory.class);
@@ -84,7 +86,6 @@ public class NettyHttpServerEngineFactor
      */
     @Resource(name = "cxf")
     public final void setBus(Bus bus) {
-        assert this.bus == null || this.bus == bus;
         this.bus = bus;
         if (bus != null) {
             bus.setExtension(this, NettyHttpServerEngineFactory.class);



Mime
View raw message