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

Merge pull request #20 from b95505017/websocket_okhttp_2.4

Browse Source 
upgrade okhttp_ws to 2.4.0
This commit is contained in:
Naoyuki Kanezawa
2015-05-31 06:06:29 +09:00
parent d79d63c747 fd79993920
commit 671b6a5683
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -45,7 +45,7 @@
<dependency> <dependency>
<groupId>com.squareup.okhttp</groupId> <groupId>com.squareup.okhttp</groupId>
<artifactId>okhttp-ws</artifactId> <artifactId>okhttp-ws</artifactId>
<version>2.3.0</version> <version>2.4.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.json</groupId> <groupId>org.json</groupId>

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

@@ -57,7 +57,7 @@ public class WebSocket extends Transport {
final Request request = builder.build(); final Request request = builder.build();
(wsCall = WebSocketCall.create(client, request)).enqueue(new WebSocketListener() { (wsCall = WebSocketCall.create(client, request)).enqueue(new WebSocketListener() {
@Override @Override
public void onOpen(com.squareup.okhttp.ws.WebSocket webSocket, Request request, Response response) throws IOException { public void onOpen(com.squareup.okhttp.ws.WebSocket webSocket, Response response) {
ws = webSocket; ws = webSocket;
final Map<String, String> headers = new TreeMap<String, String>(String.CASE_INSENSITIVE_ORDER); final Map<String, String> headers = new TreeMap<String, String>(String.CASE_INSENSITIVE_ORDER);
Headers responseHeaders = response.headers(); Headers responseHeaders = response.headers();
@@ -124,11 +124,11 @@ public class WebSocket extends Transport {
} }
@Override @Override
public void onFailure(final IOException e) { public void onFailure(final IOException e, final Response response) {
EventThread.exec(new Runnable() { EventThread.exec(new Runnable() {
@Override @Override
public void run() { public void run() {
self.onError("websocket error", e); self.onError("websocket error " + response.toString(), e);
} }
}); });
} }