cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject svn commit: r1514325 - /cxf/trunk/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngine.java
Date Thu, 15 Aug 2013 15:32:26 GMT
Author: ningjiang
Date: Thu Aug 15 15:32:26 2013
New Revision: 1514325

URL: http://svn.apache.org/r1514325
Log:
CXF-5177 fixed the NettyHttpServerEngineTest hang issue

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

Modified: cxf/trunk/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngine.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/NettyHttpServerEngine.java?rev=1514325&r1=1514324&r2=1514325&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngine.java
(original)
+++ cxf/trunk/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpServerEngine.java
Thu Aug 15 15:32:26 2013
@@ -214,27 +214,12 @@ public class NettyHttpServerEngine imple
         }
         
         if (serverChannel != null) {
-            try {
-                serverChannel.closeFuture().sync();
-            } catch (InterruptedException exception) {
-                // do nothing here;
-            }
+            serverChannel.close();
         }
         
         bossGroup.shutdownGracefully();
         workerGroup.shutdownGracefully();
-        
-        // Wait until all threads are terminated.
-        try {
-            bossGroup.terminationFuture().sync();
-        } catch (InterruptedException exception) {
-            // do nothing here;
-        }
-        try {
-            workerGroup.terminationFuture().sync();
-        } catch (InterruptedException exception) {
-            // do nothing here;
-        }
+       
     }
 
     public int getReadIdleTime() {



Mime
View raw message