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

Merge branch 'master' of github.com:nkzawa/socket.io-client.java

Browse Source
This commit is contained in:
Naoyuki Kanezawa
2015-01-11 05:07:31 +09:00
parent 9ccaa26b45 b9e8f18b26
commit 8eaebfaf97
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/com/github/nkzawa/socketio/client/Socket.java
View File

@@ -173,8 +173,7 @@ public class Socket extends Emitter {
for (Object arg : _args) {
jsonArgs.put(arg);
}
int parserType = Parser.EVENT;
if (HasBinary.hasBinary(jsonArgs)) { parserType = Parser.BINARY_EVENT; }
int parserType = HasBinary.hasBinary(jsonArgs) ? Parser.BINARY_EVENT : Parser.EVENT;
Packet<JSONArray> packet = new Packet<JSONArray>(parserType, jsonArgs);
if (_args.get(_args.size() - 1) instanceof Ack) {
@@ -229,7 +228,13 @@ public class Socket extends Emitter {
addAll(Arrays.asList(args));
}
}};
Packet<JSONArray> packet = new Packet<JSONArray>(Parser.EVENT, new JSONArray(_args));
JSONArray jsonArgs = new JSONArray();
for (Object _arg : _args) {
jsonArgs.put(_arg);
}
int parserType = HasBinary.hasBinary(jsonArgs) ? Parser.BINARY_EVENT : Parser.EVENT;
Packet<JSONArray> packet = new Packet<JSONArray>(parserType, jsonArgs);
logger.fine(String.format("emitting packet with ack id %d", ids));
Socket.this.acks.put(ids, ack);