1 files changed, 4 insertions, 0 deletions
diff --git a/client/src/com/vaadin/client/communication/AtmospherePushConnection.java b/client/src/com/vaadin/client/communication/AtmospherePushConnection.java
index 4bf12ca1f3..320ba9ebe7 100644
--- a/client/src/com/vaadin/client/communication/AtmospherePushConnection.java
+++ b/client/src/com/vaadin/client/communication/AtmospherePushConnection.java
@@ -350,6 +350,10 @@ public class AtmospherePushConnection implements PushConnection {
 
     protected void onReconnect(JavaScriptObject request,
             final AtmosphereResponse response) {
+        if (state == State.CONNECTED) {
+            VConsole.log("No onClose was received before reconnect. Forcing state to closed.");
+            state = State.CONNECT_PENDING;
+        }
         VConsole.log("Reopening push connection");
     }