svn commit: r1514294 - in /cxf/trunk/rt/transports/http-netty: netty-client/ netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/

[ningjiang]

Author: ningjiang
Date: Thu Aug 15 14:30:09 2013
New Revision: 1514294

URL: http://svn.apache.org/r1514294
Log:
CXF-5177 fixed the unit test error of netty-server

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

Modified: cxf/trunk/rt/transports/http-netty/netty-client/pom.xml
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-netty/netty-client/pom.xml?rev=1514294&r1=1514293&r2=1514294&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http-netty/netty-client/pom.xml (original)
+++ cxf/trunk/rt/transports/http-netty/netty-client/pom.xml Thu Aug 15 14:30:09 
2013
@@ -54,6 +54,7 @@
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty</artifactId>
+            <version>3.6.5.Final</version>
         </dependency>
         
          <dependency>

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=1514294&r1=1514293&r2=1514294&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 14:30:09 2013
@@ -209,12 +209,18 @@ public class NettyHttpServerEngine imple
 
     public void shutdown() {
         // just unbind the channel
-        if (serverChannel != null) {
-            serverChannel.close();
-        }
         if (servletPipeline != null) {
             servletPipeline.shutdown();
         }
+        
+        /*if (serverChannel != null) {
+            try {
+                serverChannel.close().sync();
+            } catch (InterruptedException exception) {
+                // do nothing here;
+            }
+        }*/
+        
         bossGroup.shutdownGracefully();
         workerGroup.shutdownGracefully();
         

Modified: 
cxf/trunk/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpServletHandler.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/NettyHttpServletHandler.java?rev=1514294&r1=1514293&r2=1514294&view=diff
==============================================================================
--- 
cxf/trunk/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpServletHandler.java
 (original)
+++ 
cxf/trunk/rt/transports/http-netty/netty-server/src/main/java/org/apache/cxf/transport/http/netty/server/NettyHttpServletHandler.java
 Thu Aug 15 14:30:09 2013
@@ -115,7 +115,7 @@ public class NettyHttpServletHandler ext
     
     @Override
     public void channelReadComplete(ChannelHandlerContext ctx) throws 
Exception {
-        ctx.fireChannelReadComplete();
+        ctx.flush();
     }
    
     protected void handleHttpServletRequest(ChannelHandlerContext ctx,
@@ -180,7 +180,7 @@ public class NettyHttpServletHandler ext
             }
 
         }
-
+        ctx.close();
     }
 
     private void sendError(ChannelHandlerContext ctx, HttpResponseStatus 
status) {