Author: markt
Date: Tue Jan 13 15:48:06 2015
New Revision: 1651389
URL: http://svn.apache.org/r1651389
Log:
Fix refactoring regression. Don't read more data than there is space
for.
Modified:
tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java?rev=1651389&r1=1651388&r2=1651389&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalAprInputBuffer.java Tue
Jan 13 15:48:06 2015
@@ -181,10 +181,11 @@ public class InternalAprInputBuffer exte
boolean readDone = false;
int result = 0;
+ int readLimit = Math.min(bbuf.capacity(), buf.length - lastValid);
readLock.lock();
try {
if (wrapper.getBlockingStatus() == block) {
- result = Socket.recvbb(socket, 0, buf.length - lastValid);
+ result = Socket.recvbb(socket, 0, readLimit);
readDone = true;
}
} finally {
@@ -206,7 +207,7 @@ public class InternalAprInputBuffer exte
readLock.lock();
try {
writeLock.unlock();
- result = Socket.recvbb(socket, 0, buf.length - lastValid);
+ result = Socket.recvbb(socket, 0, readLimit);
} finally {
readLock.unlock();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
