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:13:59 UTC
svn commit: r1648899 - in /tomcat/trunk/java/org/apache/coyote/http11:
AbstractOutputBuffer.java InternalAprOutputBuffer.java
InternalNio2OutputBuffer.java InternalNioOutputBuffer.java
Author: markt
Date: Thu Jan 1 17:13:59 2015
New Revision: 1648899
URL: http://svn.apache.org/r1648899
Log:
Pull up the utility transfer methods
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
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=1648899&r1=1648898&r2=1648899&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:13:59 2015
@@ -640,4 +640,22 @@ public abstract class AbstractOutputBuff
}
return result;
}
+
+
+ // --------------------------------------------------------- Utility methods
+
+ protected static int transfer(byte[] from, int offset, int length, ByteBuffer to) {
+ int max = Math.min(length, to.remaining());
+ to.put(from, offset, max);
+ return max;
+ }
+
+
+ protected static void transfer(ByteBuffer from, ByteBuffer to) {
+ int max = Math.min(from.remaining(), to.remaining());
+ int fromLimit = from.limit();
+ from.limit(from.position() + max);
+ to.put(from);
+ from.limit(fromLimit);
+ }
}
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=1648899&r1=1648898&r2=1648899&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:13:59 2015
@@ -284,15 +284,6 @@ public class InternalAprOutputBuffer ext
}
- private void transfer(ByteBuffer from, ByteBuffer to) {
- int max = Math.min(from.remaining(), to.remaining());
- int fromLimit = from.limit();
- from.limit(from.position() + max);
- to.put(from);
- from.limit(fromLimit);
- }
-
-
//-------------------------------------------------- Non-blocking IO methods
@Override
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=1648899&r1=1648898&r2=1648899&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:13:59 2015
@@ -334,13 +334,6 @@ public class InternalNio2OutputBuffer ex
}
- private int transfer(byte[] from, int offset, int length, ByteBuffer to) {
- int max = Math.min(length, to.remaining());
- to.put(from, offset, max);
- return max;
- }
-
-
/**
* Callback to write data from the buffer.
*/
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=1648899&r1=1648898&r2=1648899&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:13:59 2015
@@ -267,22 +267,6 @@ public class InternalNioOutputBuffer ext
}
- private int transfer(byte[] from, int offset, int length, ByteBuffer to) {
- int max = Math.min(length, to.remaining());
- to.put(from, offset, max);
- return max;
- }
-
-
- private void transfer(ByteBuffer from, ByteBuffer to) {
- int max = Math.min(from.remaining(), to.remaining());
- ByteBuffer tmp = from.duplicate ();
- tmp.limit (tmp.position() + max);
- to.put (tmp);
- from.position(from.position() + max);
- }
-
-
// ----------------------------------- OutputStreamOutputBuffer Inner Class
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org