Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimone Bordet2011-12-23 10:51:14 +0000
committerSimone Bordet2011-12-23 10:51:14 +0000
commit371e998b6232174489c42029b75f90f3cb1d0ef5 (patch)
treec42e4cc8024a9bb17c9c80e7e923d7a8de1e07ab /jetty-client/src/main/java/org/eclipse
parent62bec09a6b058d14139561a2aba7867a4df9a910 (diff)
downloadorg.eclipse.jetty.project-371e998b6232174489c42029b75f90f3cb1d0ef5.tar.gz
org.eclipse.jetty.project-371e998b6232174489c42029b75f90f3cb1d0ef5.tar.xz
org.eclipse.jetty.project-371e998b6232174489c42029b75f90f3cb1d0ef5.zip
367485 - HttpExchange canceled before response do not release connection.
Diffstat (limited to 'jetty-client/src/main/java/org/eclipse')
-rw-r--r--jetty-client/src/main/java/org/eclipse/jetty/client/AbstractHttpConnection.java8
1 files changed, 6 insertions, 2 deletions
diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/AbstractHttpConnection.java b/jetty-client/src/main/java/org/eclipse/jetty/client/AbstractHttpConnection.java
index 00571cad0b..a032b38b17 100644
--- a/jetty-client/src/main/java/org/eclipse/jetty/client/AbstractHttpConnection.java
+++ b/jetty-client/src/main/java/org/eclipse/jetty/client/AbstractHttpConnection.java
@@ -179,7 +179,7 @@ public abstract class AbstractHttpConnection extends AbstractConnection implemen
_generator.setVersion(_exchange.getVersion());
String method=_exchange.getMethod();
- String uri = _exchange.getURI();
+ String uri = _exchange.getRequestURI();
if (_destination.isProxied() && !HttpMethods.CONNECT.equals(method) && uri.startsWith("/"))
{
boolean secure = _destination.isSecure();
@@ -394,7 +394,11 @@ public abstract class AbstractHttpConnection extends AbstractConnection implemen
}
}
- _endp.close();
+ if (_endp.isOpen())
+ {
+ _endp.close();
+ _destination.returnConnection(this, true);
+ }
}
public void setIdleTimeout()

Back to the top