You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2013/02/27 20:05:06 UTC

svn commit: r1450921 - /cxf/branches/2.7.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java

Author: dkulp
Date: Wed Feb 27 19:05:06 2013
New Revision: 1450921

URL: http://svn.apache.org/r1450921
Log:
Merged revisions 1450916 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1450916 | dkulp | 2013-02-27 10:59:42 -0800 (Wed, 27 Feb 2013) | 3 lines

  [CXF-4855] Fix problem with prematurely flushing the stream.
  Patch from Mattias Lundstrom applied

........

Modified:
    cxf/branches/2.7.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java

Modified: cxf/branches/2.7.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java?rev=1450921&r1=1450920&r2=1450921&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java (original)
+++ cxf/branches/2.7.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java Wed Feb 27 19:05:06 2013
@@ -418,6 +418,13 @@ public class JettyHTTPDestination extend
             written = true;
             out.write(b, off, len);
         }
+
+        @Override
+        public void close() throws IOException {
+            // Avoid calling flush() here. It interferes with
+            // content length calculation in the generator.
+            out.close();
+        }
     }
     static class CountingInputStream extends FilterInputStream {
         int count;