Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix a regression closing WebSockets before connect #5707

Merged
merged 1 commit into from Jan 7, 2020
Merged

Fix a regression closing WebSockets before connect #5707

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 4 additions & 1 deletion okhttp/src/main/java/okhttp3/internal/ws/RealWebSocket.kt
View file
Open in desktop
Expand Up @@ -395,7 +395,10 @@ class RealWebSocket(
private fun runWriter() {
this.assertThreadHoldsLock()

taskQueue.schedule(writerTask!!)
val writerTask = writerTask
if (writerTask != null) {
taskQueue.schedule(writerTask)
}
}

/**
Expand Down
10 changes: 10 additions & 0 deletions okhttp/src/test/java/okhttp3/internal/ws/WebSocketHttpTest.java
View file
Open in desktop
Expand Up @@ -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()
Expand Down