Skip to content

Safely call close on the websocket client with synchronized calls #83

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

Merged
merged 2 commits into from
Apr 16, 2018
Merged

Safely call close on the websocket client with synchronized calls #83

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
705f986
Safely call close on the websocket client with synchronized calls
mmimeault Apr 16, 2018
d07f392
Added a test and more synchronized logic
mmimeault Apr 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions ParseLiveQuery/src/main/java/com/parse/OkHttp3SocketClientFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ static class OkHttp3WebSocketClient implements WebSocketClient {

private final WebSocketClientCallback webSocketClientCallback;
private WebSocket webSocket;
private State state = State.NONE;
private volatile State state = State.NONE;
private final OkHttpClient client;
private final String url;
private final int STATUS_CODE = 1000;
Expand Down Expand Up @@ -73,7 +73,7 @@ public void onFailure(okhttp3.WebSocket webSocket, Throwable t, Response respons
};

private OkHttp3WebSocketClient(OkHttpClient okHttpClient,
WebSocketClientCallback webSocketClientCallback, URI hostUrl) {
WebSocketClientCallback webSocketClientCallback, URI hostUrl) {
client = okHttpClient;
this.webSocketClientCallback = webSocketClientCallback;
url = hostUrl.toString();
Expand All @@ -95,7 +95,9 @@ public synchronized void open() {
@Override
public synchronized void close() {
setState(State.DISCONNECTING);
webSocket.close(STATUS_CODE, CLOSING_MSG);
if (webSocket != null) {
webSocket.close(STATUS_CODE, CLOSING_MSG);
}
}

@Override
Expand All @@ -110,10 +112,10 @@ public State getState() {
return state;
}

private synchronized void setState(State newState) {
private void setState(State newState) {
this.state = newState;
this.webSocketClientCallback.stateChanged();
}
}

}
}
12 changes: 7 additions & 5 deletions ParseLiveQuery/src/main/java/com/parse/ParseLiveQueryClientImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
package com.parse;

import android.util.Log;
import bolts.Continuation;
import bolts.Task;
import okhttp3.OkHttpClient;

import org.json.JSONException;
import org.json.JSONObject;

Expand All @@ -17,6 +15,10 @@
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.Executor;

import bolts.Continuation;
import bolts.Task;
import okhttp3.OkHttpClient;

import static com.parse.Parse.checkInit;

/* package */ class ParseLiveQueryClientImpl implements ParseLiveQueryClient {
Expand Down Expand Up @@ -142,7 +144,7 @@ public <T extends ParseObject> void unsubscribe(final ParseQuery<T> query, final
}

@Override
public void reconnect() {
public synchronized void reconnect() {
if (webSocketClient != null) {
webSocketClient.close();
}
Expand All @@ -154,7 +156,7 @@ public void reconnect() {
}

@Override
public void disconnect() {
public synchronized void disconnect() {
if (webSocketClient != null) {
webSocketClient.close();
webSocketClient = null;
Expand Down