h4ckx0r/engine.io-client-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove unused check, catch an exception thrown when the socket is already closed

Browse Source
This commit is contained in:
Naoyuki Kanezawa
2015-05-02 15:31:56 +09:00
parent 191416cbe8
commit 5f2b89e6d6
1 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/com/github/nkzawa/engineio/client/transports/WebSocket.java
View File

@@ -13,18 +13,16 @@ import com.squareup.okhttp.Response;
import com.squareup.okhttp.ws.WebSocket.PayloadType; import com.squareup.okhttp.ws.WebSocket.PayloadType;
import com.squareup.okhttp.ws.WebSocketCall; import com.squareup.okhttp.ws.WebSocketCall;
import com.squareup.okhttp.ws.WebSocketListener; import com.squareup.okhttp.ws.WebSocketListener;
import okio.Buffer;
import okio.BufferedSource;
import javax.net.ssl.SSLSocketFactory;
import java.io.IOException; import java.io.IOException;
import java.util.Date; import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.TreeMap; import java.util.TreeMap;
import javax.net.ssl.SSLSocketFactory;
import okio.Buffer;
import okio.BufferedSource;
import static com.squareup.okhttp.ws.WebSocket.PayloadType.BINARY; import static com.squareup.okhttp.ws.WebSocket.PayloadType.BINARY;
import static com.squareup.okhttp.ws.WebSocket.PayloadType.TEXT; import static com.squareup.okhttp.ws.WebSocket.PayloadType.TEXT;
@@ -40,10 +38,6 @@ public class WebSocket extends Transport {
} }
protected void doOpen() { protected void doOpen() {
if (!this.check()) {
return;
}
Map<String, String> headers = new TreeMap<String, String>(String.CASE_INSENSITIVE_ORDER); Map<String, String> headers = new TreeMap<String, String>(String.CASE_INSENSITIVE_ORDER);
this.emit(EVENT_REQUEST_HEADERS, headers); this.emit(EVENT_REQUEST_HEADERS, headers);
@@ -189,7 +183,9 @@ public class WebSocket extends Transport {
try { try {
ws.close(1000, ""); ws.close(1000, "");
} catch (IOException e) { } catch (IOException e) {
onError("doClose error", e); onError("websocket error", e);
} catch (IllegalStateException e) {
// do nothing
} }
ws = null; ws = null;
} }
@@ -219,10 +215,4 @@ public class WebSocket extends Transport {
return schema + "://" + this.hostname + port + this.path + _query; return schema + "://" + this.hostname + port + this.path + _query;
} }
private boolean check() {
// for checking if the websocket is available. Should we remove?
return true;
}
} }