Author: fhanik
Date: Thu Feb 14 06:03:10 2008
New Revision: 627745
URL: http://svn.apache.org/viewvc?rev=627745&view=rev
Log:
implement fix
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=627745&r1=627744&r2=627745&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Feb 14 06:03:10 2008
@@ -76,11 +76,6 @@
+1: markt
-1:
-* Handle case of NIO/SSL when transferring bytes to a disconnected socket
- http://svn.apache.org/viewvc?rev=618420&view=rev
- +1: fhanik, markt, pero
- -1:
-
* Use a single lock for synchronized session manipulation
http://svn.apache.org/viewvc?rev=618823&view=rev
+1: fhanik, markt, pero
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java?rev=627745&r1=627744&r2=627745&view=diff
==============================================================================
---
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java
Thu Feb 14 06:03:10 2008
@@ -794,7 +794,7 @@
byte[] b = chunk.getBuffer();
while (len > 0) {
int thisTime = len;
- if (socket.getBufHandler().getWriteBuffer().position() ==
socket.getBufHandler().getWriteBuffer().capacity()) {
+ if (socket.getBufHandler().getWriteBuffer().position() ==
socket.getBufHandler().getWriteBuffer().capacity()
||socket.getBufHandler().getWriteBuffer().remaining()==0) {
flushBuffer();
}
if (thisTime >
socket.getBufHandler().getWriteBuffer().remaining()) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
