Close the channel on manual disconnect

Close the socket channel on manual disconnect() – otherwise channel remains opened and isConnected() will return true but no further request will succeed.
franciscotbjr · Aug 26, 2014 · 334cd9f · 334cd9f
1 parent f711039
commit 334cd9f
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/Autobahn/src/de/tavendo/autobahn/WebSocketConnection.java b/Autobahn/src/de/tavendo/autobahn/WebSocketConnection.java
@@ -439,7 +439,17 @@ public void handleMessage(Message msg) {
                final int tavendoCloseCode = (close.mCode == 1000) ? ConnectionHandler.CLOSE_NORMAL : ConnectionHandler.CLOSE_CONNECTION_LOST;
                onClose(tavendoCloseCode, close.mReason);
 
-               mWriter.forward(new WebSocketMessage.Close(1000));
+               if (mActive) {
+                   mWriter.forward(new WebSocketMessage.Close(1000));        
+               } else {
+                   // we've initiated disconnect, so ready to close the channel
+                    try {
+                        mTransportChannel.close();
+                    } catch (IOException e) {
+                        if (DEBUG) e.printStackTrace();
+                    }
+               }
+
 
             } else if (msg.obj instanceof WebSocketMessage.ServerHandshake) {