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

debug 

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1544 7e9141cc-0065-0410-87d8-b60c137991c4
This commit is contained in:
Greg Wilkins 2010-04-21 12:48:13 +00:00
parent af0e30d908
commit 28ead0cdbe
2 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
jetty-client/src/main/java/org/eclipse/jetty/client/HttpConnection.java
View File

@ -214,23 +214,28 @@ public class HttpConnection implements Connection
if (!_generator.isComplete()) if (!_generator.isComplete())
{ {
InputStream in = _exchange.getRequestContentSource(); if (_exchange!=null)
if (in != null)
{ {
if (_requestContentChunk == null || _requestContentChunk.length() == 0) InputStream in = _exchange.getRequestContentSource();
if (in != null)
{ {
_requestContentChunk = _exchange.getRequestContentChunk(); if (_requestContentChunk == null || _requestContentChunk.length() == 0)
_destination.getHttpClient().schedule(_timeout); {
_requestContentChunk = _exchange.getRequestContentChunk();
_destination.getHttpClient().schedule(_timeout);
if (_requestContentChunk != null) if (_requestContentChunk != null)
_generator.addContent(_requestContentChunk,false); _generator.addContent(_requestContentChunk,false);
else else
_generator.complete(); _generator.complete();
flushed = _generator.flushBuffer(); flushed = _generator.flushBuffer();
io += flushed; io += flushed;
}
} }
} else
_generator.complete();
}
else else
_generator.complete(); _generator.complete();
} }

11
jetty-client/src/main/java/org/eclipse/jetty/client/HttpExchange.java
View File

@ -15,7 +15,6 @@ package org.eclipse.jetty.client;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.net.SocketTimeoutException;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
import org.eclipse.jetty.client.security.SecurityListener; import org.eclipse.jetty.client.security.SecurityListener;
@ -823,15 +822,7 @@ public class HttpExchange
{ {
try try
{ {
if (ex instanceof SocketTimeoutException || HttpExchange.this.onException(ex);
ex.getCause() instanceof SocketTimeoutException)
{
Log.debug(ex);
setStatus(HttpExchange.STATUS_EXPIRED);
HttpExchange.this.onExpire();
}
else
HttpExchange.this.onException(ex);
} }
finally finally
{ {