Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse McConnell2012-08-23 20:11:09 +0000
committerJesse McConnell2012-08-23 20:11:09 +0000
commit5761c8201b7b48d32ff5c8b480d28695651c7628 (patch)
tree083ee121f0daae5e0d2826b7833a0d75c2f8be62
parent74e6be5097e53d9bdbb917a9372a44b8c3c3d48b (diff)
downloadorg.eclipse.jetty.project-5761c8201b7b48d32ff5c8b480d28695651c7628.tar.gz
org.eclipse.jetty.project-5761c8201b7b48d32ff5c8b480d28695651c7628.tar.xz
org.eclipse.jetty.project-5761c8201b7b48d32ff5c8b480d28695651c7628.zip
[Bug 385049] fix issue with pipelined connections when switching protocols
-rw-r--r--jetty-client/src/main/java/org/eclipse/jetty/client/AsyncHttpConnection.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/AsyncHttpConnection.java b/jetty-client/src/main/java/org/eclipse/jetty/client/AsyncHttpConnection.java
index b214d0ef0b..1ea6b06721 100644
--- a/jetty-client/src/main/java/org/eclipse/jetty/client/AsyncHttpConnection.java
+++ b/jetty-client/src/main/java/org/eclipse/jetty/client/AsyncHttpConnection.java
@@ -208,12 +208,12 @@ public class AsyncHttpConnection extends AbstractHttpConnection implements Async
{
Connection switched=exchange.onSwitchProtocol(_endp);
if (switched!=null)
- connection=switched;
{
// switched protocol!
- _pipeline = null;
if (_pipeline!=null)
+ {
_destination.send(_pipeline);
+ }
_pipeline = null;
connection=switched;

Back to the top