310918 Fixed write blocking for client HttpConnection

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1765 7e9141cc-0065-0410-87d8-b60c137991c4
This commit is contained in:
Greg Wilkins 2010-05-12 13:07:20 +00:00
parent 91bfa30e6c
commit becb140427
3 changed files with 7 additions and 1 deletions

View File

@ -11,6 +11,7 @@ jetty-7.1.1-SNAPSHOT
+ 308858 Update test suite to JUnit4 - Module jetty-plus + 308858 Update test suite to JUnit4 - Module jetty-plus
+ 308863 Update test suite to JUnit4 - Module jetty-servlet + 308863 Update test suite to JUnit4 - Module jetty-servlet
+ 308855 Update test suite to JUnit4 - Module jetty-io + 308855 Update test suite to JUnit4 - Module jetty-io
+ 310918 Fixed write blocking for client HttpConnection
jetty-7.1.0 5 May 2010 jetty-7.1.0 5 May 2010
+ 306353 fixed cross context dispatch to root context. + 306353 fixed cross context dispatch to root context.

View File

@ -393,6 +393,11 @@ public class HttpConnection implements Connection
{ {
_exchange.disassociate(); _exchange.disassociate();
} }
if (!_generator.isComplete() && _generator.getBytesBuffered()>0 && _endp instanceof AsyncEndPoint)
{
((AsyncEndPoint)_endp).setWritable(false);
}
} }
return this; return this;

View File

@ -564,7 +564,7 @@ public class SelectChannelEndPoint extends ChannelEndPoint implements Runnable,
synchronized(this) synchronized(this)
{ {
return "SCEP@" + hashCode() + "\t[d=" + _dispatched + ",io=" + _interestOps+ return "SCEP@" + hashCode() + "\t[d=" + _dispatched + ",io=" + _interestOps+
",w=" + _writable + ",b=" + _readBlocked + "|" + _writeBlocked + "]"; ",w=" + _writable + ",rb=" + _readBlocked + ",wb=" + _writeBlocked + "]";
} }
} }