tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1478087 - in /tomcat/trunk/java/org/apache/coyote/http11: AbstractOutputBuffer.java InternalAprOutputBuffer.java InternalNioOutputBuffer.java InternalOutputBuffer.java
Date Wed, 01 May 2013 16:39:42 GMT
Author: markt
Date: Wed May  1 16:39:41 2013
New Revision: 1478087

URL: http://svn.apache.org/r1478087
Log:
Pull-up flush()

Modified:
    tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java
    tomcat/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java
    tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java
    tomcat/trunk/java/org/apache/coyote/http11/InternalOutputBuffer.java

Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java?rev=1478087&r1=1478086&r2=1478087&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java Wed May  1 16:39:41
2013
@@ -256,8 +256,12 @@ public abstract class AbstractOutputBuff
                 break;
             }
         }
+
+        // Flush the current buffer(s)
+        flushBuffer(isBlocking());
     }
 
+
     /**
      * Reset current response.
      *

Modified: tomcat/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java?rev=1478087&r1=1478086&r2=1478087&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java Wed May  1 16:39:41
2013
@@ -95,22 +95,6 @@ public class InternalAprOutputBuffer ext
 
 
     /**
-     * Flush the response.
-     *
-     * @throws IOException an underlying I/O error occurred
-     */
-    @Override
-    public void flush()
-        throws IOException {
-
-        super.flush();
-
-        // Flush the current buffer
-        flushBuffer(isBlocking());
-    }
-
-
-    /**
      * Recycle the output buffer. This should be called when closing the
      * connection.
      */

Modified: tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java?rev=1478087&r1=1478086&r2=1478087&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java Wed May  1 16:39:41
2013
@@ -146,22 +146,6 @@ public class InternalNioOutputBuffer ext
     // --------------------------------------------------------- Public Methods
 
     /**
-     * Flush the response.
-     *
-     * @throws IOException an underlying I/O error occurred
-     *
-     */
-    @Override
-    public void flush() throws IOException {
-
-        super.flush();
-        // Flush the current buffer
-        flushBuffer(isBlocking());
-
-    }
-
-
-    /**
      * Recycle the output buffer. This should be called when closing the
      * connection.
      */

Modified: tomcat/trunk/java/org/apache/coyote/http11/InternalOutputBuffer.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InternalOutputBuffer.java?rev=1478087&r1=1478086&r2=1478087&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/InternalOutputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalOutputBuffer.java Wed May  1 16:39:41
2013
@@ -104,22 +104,6 @@ public class InternalOutputBuffer extend
 
 
     /**
-     * Flush the response.
-     *
-     * @throws IOException an underlying I/O error occurred
-     */
-    @Override
-    public void flush()
-        throws IOException {
-
-        super.flush();
-
-        flushBuffer(isBlocking());
-
-    }
-
-
-    /**
      * Recycle the output buffer. This should be called when closing the
      * connection.
      */



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message