1 files changed, 6 insertions, 5 deletions
diff --git a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketSession.java b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketSession.java
index 5fec26d0b2..c92c58588c 100644
--- a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketSession.java
+++ b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketSession.java
@@ -40,12 +40,12 @@ import org.eclipse.jetty.util.thread.ThreadClassLoaderScope;
 import org.eclipse.jetty.websocket.api.BatchMode;
 import org.eclipse.jetty.websocket.api.CloseException;
 import org.eclipse.jetty.websocket.api.CloseStatus;
+import org.eclipse.jetty.websocket.api.UpgradeResponse;
 import org.eclipse.jetty.websocket.api.RemoteEndpoint;
 import org.eclipse.jetty.websocket.api.Session;
 import org.eclipse.jetty.websocket.api.StatusCode;
 import org.eclipse.jetty.websocket.api.SuspendToken;
 import org.eclipse.jetty.websocket.api.UpgradeRequest;
-import org.eclipse.jetty.websocket.api.UpgradeResponse;
 import org.eclipse.jetty.websocket.api.WebSocketBehavior;
 import org.eclipse.jetty.websocket.api.WebSocketException;
 import org.eclipse.jetty.websocket.api.WebSocketPolicy;
@@ -468,10 +468,6 @@ public class WebSocketSession extends ContainerLifeCycle implements Session, Web
                         LOG.ignore(t);
                     }
                 }
-                if(openFuture != null)
-                {
-                    openFuture.complete(this);
-                }
                 break;
         }
     }
@@ -510,6 +506,11 @@ public class WebSocketSession extends ContainerLifeCycle implements Session, Web
             {
                 LOG.debug("open -> {}",dump());
             }
+            
+            if(openFuture != null)
+            {
+                openFuture.complete(this);
+            }
         }
         catch (CloseException ce)
         {