svn commit: r1760135 - /tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java

[vi...@apache.org]

Author: violetagg
Date: Sat Sep 10 08:37:31 2016
New Revision: 1760135

URL: http://svn.apache.org/viewvc?rev=1760135&view=rev
Log:
When AprSocketWrapper.read(boolean, ByteBuffer) is invoked with a non direct ByteBuffer then use the socket read buffer before transferring the data to the provided ByteBuffer.

Modified:
    tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1760135&r1=1760134&r2=1760135&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Sat Sep 10 08:37:31 2016
@@ -2323,7 +2323,7 @@ public class AprEndpoint extends Abstrac
 
             // The socket read buffer capacity is socket.appReadBufSize
             int limit = socketBufferHandler.getReadBuffer().capacity();
-            if (to.remaining() >= limit) {
+            if (to.isDirect() && to.remaining() >= limit) {
                 to.limit(to.position() + limit);
                 nRead = fillReadBuffer(block, to);
                 to.flip();



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