Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

client tests passing

This commit is contained in:
Greg Wilkins 2011-11-07 10:23:08 +11:00
parent 3e104548d5
commit 42179e193d
2 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
jetty-client/src/main/java/org/eclipse/jetty/client/AsyncHttpConnection.java
View File

@ -21,7 +21,6 @@ public class AsyncHttpConnection extends AbstractHttpConnection implements Async
private static final Logger LOG = Log.getLogger(AsyncHttpConnection.class); private static final Logger LOG = Log.getLogger(AsyncHttpConnection.class);
private boolean _requestComplete; private boolean _requestComplete;
private int _status;
private Buffer _requestContentChunk; private Buffer _requestContentChunk;
private final AsyncEndPoint _asyncEndp; private final AsyncEndPoint _asyncEndp;
@ -45,28 +44,12 @@ public class AsyncHttpConnection extends AbstractHttpConnection implements Async
try try
{ {
boolean failed = false; boolean failed = false;
int loops=10000; // TODO remove this safety net
// While we are making progress and have not changed connection // While we are making progress and have not changed connection
while (progress && connection==this) while (progress && connection==this)
{ {
LOG.debug("open={} more={} buffering={} progress={}",_endp.isOpen(),_parser.isMoreInBuffer(),_endp.isBufferingInput(),progress); LOG.debug("open={} more={} buffering={} progress={}",_endp.isOpen(),_parser.isMoreInBuffer(),_endp.isBufferingInput(),progress);
if (loops--<0)
{
System.err.println("LOOPING!!!");
System.err.println(this);
System.err.println(_endp);
_endp.close();
}
else if (loops==10)
{
LOG.setDebugEnabled(true);
Log.getLogger(HttpParser.class).setDebugEnabled(true);
Log.getLogger("org.eclipse.jetty.io.nio.ssl").setDebugEnabled(true);
}
progress=false; progress=false;
HttpExchange exchange=_exchange; HttpExchange exchange=_exchange;

2
jetty-client/src/test/java/org/eclipse/jetty/client/WebSocketUpgradeTest.java
View File

@ -162,8 +162,6 @@ public class WebSocketUpgradeTest
int status = httpExchange.waitForDone(); int status = httpExchange.waitForDone();
assertEquals(HttpExchange.STATUS_COMPLETED, status); assertEquals(HttpExchange.STATUS_COMPLETED, status);
// System.err.println("results="+_results);
assertEquals("serverWS.onConnect", _results.poll(1,TimeUnit.SECONDS)); assertEquals("serverWS.onConnect", _results.poll(1,TimeUnit.SECONDS));
TestWebSocket serverWS = (TestWebSocket)_results.poll(1,TimeUnit.SECONDS); TestWebSocket serverWS = (TestWebSocket)_results.poll(1,TimeUnit.SECONDS);