[jbossws-commits] JBossWS SVN: r10849 - stack/native/branches/ropalka/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/http.

[jbossws-commits at lists.jboss.org]

Author: alessio.soldano at jboss.com
Date: 2009-10-07 08:19:30 -0400 (Wed, 07 Oct 2009)
New Revision: 10849

Modified:
   stack/native/branches/ropalka/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/http/NettyInvocationHandler.java
Log:
[JBWS-2674][JBWS-2754] Properly wait for end of transmission


Modified: stack/native/branches/ropalka/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/http/NettyInvocationHandler.java
===================================================================
--- stack/native/branches/ropalka/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/http/NettyInvocationHandler.java	2009-10-07 12:18:29 UTC (rev 10848)
+++ stack/native/branches/ropalka/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/http/NettyInvocationHandler.java	2009-10-07 12:19:30 UTC (rev 10849)
@@ -230,11 +230,15 @@
       ChannelFuture cf = e.getChannel().write(response);
       if (responseHeaders.containsKey(HttpHeaders.Names.CONTENT_TYPE))
       {
-         OutputStream out = new NettyTransportOutputStream(channel, 1024);
+         NettyTransportOutputStream out = new NettyTransportOutputStream(channel, 1024);
          out.write(content.getBytes("UTF-8"));
          out.close();
+         out.getChannelFuture().awaitUninterruptibly();
       }
-      cf.awaitUninterruptibly();
+      else
+      {
+         cf.awaitUninterruptibly();
+      }
    }
    
    private List<String> removeProhibitedCharacters(List<String> values)