You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2015/01/01 18:14:10 UTC

svn commit: r1648901 - in /tomcat/trunk: java/org/apache/coyote/http11/ test/org/apache/coyote/http11/filters/

Author: markt
Date: Thu Jan  1 17:14:10 2015
New Revision: 1648901

URL: http://svn.apache.org/r1648901
Log:
Add addToBB(byte[],int,int) to base class as an abstract method to
facilitate future refactoring.

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/InternalNio2OutputBuffer.java
    tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java
    tomcat/trunk/test/org/apache/coyote/http11/filters/TesterOutputBuffer.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=1648901&r1=1648900&r2=1648901&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java Thu Jan  1 17:14:10 2015
@@ -586,6 +586,9 @@ public abstract class AbstractOutputBuff
     }
 
 
+    protected abstract void addToBB(byte[] buf, int offset, int length) throws IOException;
+
+
     //------------------------------------------------------ Non-blocking writes
 
     protected abstract void registerWriteInterest() throws IOException;

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=1648901&r1=1648900&r2=1648901&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalAprOutputBuffer.java Thu Jan  1 17:14:10 2015
@@ -138,7 +138,8 @@ public class InternalAprOutputBuffer ext
     }
 
 
-    private synchronized void addToBB(byte[] buf, int offset, int length)
+    @Override
+    protected synchronized void addToBB(byte[] buf, int offset, int length)
             throws IOException {
 
         if (length == 0) return;

Modified: tomcat/trunk/java/org/apache/coyote/http11/InternalNio2OutputBuffer.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InternalNio2OutputBuffer.java?rev=1648901&r1=1648900&r2=1648901&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/InternalNio2OutputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalNio2OutputBuffer.java Thu Jan  1 17:14:10 2015
@@ -279,7 +279,8 @@ public class InternalNio2OutputBuffer ex
         return false;
     }
 
-    private void addToBB(byte[] buf, int offset, int length)
+    @Override
+    protected void addToBB(byte[] buf, int offset, int length)
             throws IOException {
 
         if (length == 0)

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=1648901&r1=1648900&r2=1648901&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java Thu Jan  1 17:14:10 2015
@@ -172,7 +172,8 @@ public class InternalNioOutputBuffer ext
     }
 
 
-    private synchronized void addToBB(byte[] buf, int offset, int length)
+    @Override
+    protected synchronized void addToBB(byte[] buf, int offset, int length)
             throws IOException {
 
         if (length == 0) return;

Modified: tomcat/trunk/test/org/apache/coyote/http11/filters/TesterOutputBuffer.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/coyote/http11/filters/TesterOutputBuffer.java?rev=1648901&r1=1648900&r2=1648901&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/coyote/http11/filters/TesterOutputBuffer.java (original)
+++ tomcat/trunk/test/org/apache/coyote/http11/filters/TesterOutputBuffer.java Thu Jan  1 17:14:10 2015
@@ -103,6 +103,13 @@ public class TesterOutputBuffer extends
     }
 
 
+    @Override
+    protected void addToBB(byte[] buf, int offset, int length)
+            throws IOException {
+        // NO-OP: Unused
+    }
+
+
     /*
      * Expose data written for use by unit tests.
      */



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