From 912dfa211bc2cfecea61449b2c16a26b1c23bc70 Mon Sep 17 00:00:00 2001 From: Dave Roberge Date: Sun, 17 Jul 2016 12:41:52 -0400 Subject: [PATCH] Close the web socket after sending a close frame. Previously, the underlying socket was being closed with the cancel call. Because the socket was closed, the close frame could never be sent. --- .../io/socket/engineio/client/transports/WebSocket.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/io/socket/engineio/client/transports/WebSocket.java b/src/main/java/io/socket/engineio/client/transports/WebSocket.java index bb17684..c4101a9 100644 --- a/src/main/java/io/socket/engineio/client/transports/WebSocket.java +++ b/src/main/java/io/socket/engineio/client/transports/WebSocket.java @@ -190,9 +190,6 @@ public class WebSocket extends Transport { } protected void doClose() { - if (wsCall != null) { - wsCall.cancel(); - } if (ws != null) { try { ws.close(1000, ""); @@ -202,6 +199,9 @@ public class WebSocket extends Transport { // websocket already closed } } + if (wsCall != null) { + wsCall.cancel(); + } } protected String uri() {