svn commit: r1524476 - in /cxf/trunk/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server: NettyHttpServerEngineFactory.java NettyHttpServletPipelineFactory.java

[ningjiang]

Author: ningjiang
Date: Wed Sep 18 16:09:35 2013
New Revision: 1524476

URL: http://svn.apache.org/r1524476
Log:
CXF-5281 fixed the netty-server transport restart issue

Modified:
    
cxf/trunk/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngineFactory.java
    
cxf/trunk/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpServletPipelineFactory.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=1524476&r1=1524475&r2=1524476&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
 Wed Sep 18 16:09:35 2013
@@ -131,6 +131,9 @@ public class NettyHttpServerEngineFactor
         for (NettyHttpServerEngine engine : engines) {
             engine.shutdown();
         }
+        // The engine which is in shutdown status cannot be started anymore
+        portMap.clear();
+        threadingParametersMap.clear();
         tlsServerParametersMap.clear();
     }
 

Modified: 
cxf/trunk/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpServletPipelineFactory.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/NettyHttpServletPipelineFactory.java?rev=1524476&r1=1524475&r2=1524476&view=diff
==============================================================================
--- 
cxf/trunk/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpServletPipelineFactory.java
 (original)
+++ 
cxf/trunk/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpServletPipelineFactory.java
 Wed Sep 18 16:09:35 2013
@@ -108,7 +108,7 @@ public class NettyHttpServletPipelineFac
     }
     
     public void shutdown() {
-        allChannels.close().awaitUninterruptibly();
+        allChannels.close();
         watchdog.stopWatching();
         
     }