Log error for if onClose happens in reconnecting state and moved resetting the number of reconnection attempts after the state has been updated to Connected

Author: Zan Markan

src/main/java/com/pusher/client/connection/websocket/WebSocketConnection.java

@@ -178,7 +178,6 @@ private void handleEvent(final String event, final String wholeMessage) {
     private void handleInternalEvent(final String event, final String wholeMessage) {
         if (event.equals("pusher:connection_established")) {
             handleConnectionMessage(wholeMessage);
-            reconnectAttempts = 0;
         }
         else if (event.equals("pusher:error")) {
             handleError(wholeMessage);
@@ -193,6 +192,7 @@ private void handleConnectionMessage(final String message) {
         socketId = (String)dataMap.get("socket_id");
 
         updateState(ConnectionState.CONNECTED);
+        reconnectAttempts = 0;
     }
 
     @SuppressWarnings("rawtypes")
@@ -259,8 +259,8 @@ public void run() {
 
     @Override
     public void onClose(final int code, final String reason, final boolean remote) {
-        if (state == ConnectionState.DISCONNECTED) {
-            log.error("Received close from underlying socket when already disconnected. " + "Close code ["
+        if (state == ConnectionState.DISCONNECTED || state == ConnectionState.RECONNECTING) {
+            log.error("Received close from underlying socket when already disconnected." + "Close code ["
                     + code + "], Reason [" + reason + "], Remote [" + remote + "]");
             return;
         }