Merge pull request #5707 from square/jwilson.0106.close_without_connect_

Fix a regression closing WebSockets before connect
square · Jan 7, 2020 · 1e02ecd · 1e02ecd
2 parents 1533935 + 43996f3
commit 1e02ecd
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/okhttp/src/main/java/okhttp3/internal/ws/RealWebSocket.kt b/okhttp/src/main/java/okhttp3/internal/ws/RealWebSocket.kt
@@ -395,7 +395,10 @@ class RealWebSocket(
   private fun runWriter() {
     this.assertThreadHoldsLock()
 
-    taskQueue.schedule(writerTask!!)
+    val writerTask = writerTask
+    if (writerTask != null) {
+      taskQueue.schedule(writerTask)
+    }
   }
 
   /**

diff --git a/okhttp/src/test/java/okhttp3/internal/ws/WebSocketHttpTest.java b/okhttp/src/test/java/okhttp3/internal/ws/WebSocketHttpTest.java
@@ -762,6 +762,16 @@ public final class WebSocketHttpTest {
     assertThat(webServer.takeRequest().getSequenceNumber()).isEqualTo(1);
   }
 
+  /** https://github.com/square/okhttp/issues/5705 */
+  @Test public void closeWithoutSuccessfulConnect() {
+    Request request = new Request.Builder()
+        .url(webServer.url("/"))
+        .build();
+    WebSocket webSocket = client.newWebSocket(request, clientListener);
+    webSocket.send("hello");
+    webSocket.close(1000, null);
+  }
+
   private MockResponse upgradeResponse(RecordedRequest request) {
     String key = request.getHeader("Sec-WebSocket-Key");
     return new MockResponse()