294563 removed UpgradeConnectionException from websocket handling

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1263 7e9141cc-0065-0410-87d8-b60c137991c4

2 files changed, 17 insertions, 4 deletions

diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/HttpConnection.java b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpConnection.java
index 04abb303f0..42d00c31ba 100644
--- a/jetty-client/src/main/java/org/eclipse/jetty/client/HttpConnection.java
+++ b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpConnection.java
@@ -133,7 +133,7 @@ public class HttpConnection implements Connection
         }
     }
 
-    public void handle() throws IOException
+    public Connection handle() throws IOException
     {
         if (_exchange != null)
             _exchange.associate(this);
@@ -171,7 +171,7 @@ public class HttpConnection implements Connection
                                 Log.warn("Unexpected data received but no request sent");
                                 close();
                             }
-                            return;
+                            return this;
                         }
                     }
                     if (!_exchange.isAssociated())
@@ -251,7 +251,7 @@ public class HttpConnection implements Connection
                             if (_generator.flushBuffer()>0)
                                 continue;
                         }
-                        return;
+                        return this;
                     }
                 }
                 catch (Throwable e)
@@ -363,6 +363,8 @@ public class HttpConnection implements Connection
                 _exchange.disassociate();
             }
         }
+        
+        return this;
     }
 
     public boolean isIdle()
diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/SocketConnector.java b/jetty-client/src/main/java/org/eclipse/jetty/client/SocketConnector.java
index 358dff8f5f..0da8617f90 100644
--- a/jetty-client/src/main/java/org/eclipse/jetty/client/SocketConnector.java
+++ b/jetty-client/src/main/java/org/eclipse/jetty/client/SocketConnector.java
@@ -18,6 +18,7 @@ import java.net.Socket;
 import javax.net.SocketFactory;
 import javax.net.ssl.SSLContext;
 
+import org.eclipse.jetty.io.Connection;
 import org.eclipse.jetty.io.EndPoint;
 import org.eclipse.jetty.io.bio.SocketEndPoint;
 import org.eclipse.jetty.util.component.AbstractLifeCycle;
@@ -67,7 +68,17 @@ class SocketConnector extends AbstractLifeCycle implements HttpClient.Connector
             {
                 try
                 {
-                    connection.handle();
+                    Connection con = connection;
+                    while(true)
+                    {
+                        final Connection next = con.handle();
+                        if (next!=con)
+                        {  
+                            con=next;
+                            continue;
+                        }
+                        break;
+                    }
                 }
                 catch (IOException e)
                 {