Skip to content

Commit 8691cf4

Browse files
nkzawankzawa
committed
Merge branch 'master' of github.com:socketio/socket.io-client-java
2 parents 22fe12f + a3f2b8c commit 8691cf4

File tree

6 files changed

+31
-13
lines changed

6 files changed

+31
-13
lines changed

‎src/main/java/io/socket/backo/Backoff.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ public class Backoff {
88
private long ms = 100;
99
private long max = 10000;
1010
private int factor = 2;
11-
private double jitter = 0.0;
12-
private int attempts = 0;
11+
private double jitter;
12+
private int attempts;
1313

1414
public Backoff() {}
1515

‎src/main/java/io/socket/client/Manager.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public class Manager extends Emitter {
7272
/*package*/ static SSLContext defaultSSLContext;
7373
/*package*/ static HostnameVerifier defaultHostnameVerifier;
7474

75-
/*package*/ ReadyState readyState = null;
75+
/*package*/ ReadyState readyState;
7676

7777
private boolean _reconnection;
7878
private boolean skipReconnect;
@@ -180,7 +180,7 @@ public Manager reconnectionAttempts(int v) {
180180
return this;
181181
}
182182

183-
public long reconnectionDelay() {
183+
public final long reconnectionDelay() {
184184
return this._reconnectionDelay;
185185
}
186186

@@ -192,7 +192,7 @@ public Manager reconnectionDelay(long v) {
192192
return this;
193193
}
194194

195-
public double randomizationFactor() {
195+
public final double randomizationFactor() {
196196
return this._randomizationFactor;
197197
}
198198

@@ -204,7 +204,7 @@ public Manager randomizationFactor(double v) {
204204
return this;
205205
}
206206

207-
public long reconnectionDelayMax() {
207+
public final long reconnectionDelayMax() {
208208
return this._reconnectionDelayMax;
209209
}
210210

@@ -416,7 +416,7 @@ public void call(Object... objects) {
416416

417417
/*package*/ void destroy(Socket socket) {
418418
this.connected.remove(socket);
419-
if (this.connected.size() > 0) return;
419+
if (!this.connected.isEmpty()) return;
420420

421421
this.close();
422422
}
@@ -447,7 +447,7 @@ public void call(Object[] encodedPackets) {
447447
}
448448

449449
private void processPacketQueue() {
450-
if (this.packetBuffer.size() > 0 && !this.encoding) {
450+
if (!this.packetBuffer.isEmpty() && !this.encoding) {
451451
Packet pack = this.packetBuffer.remove(0);
452452
this.packet(pack);
453453
}

‎src/main/java/io/socket/client/Socket.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import org.json.JSONObject;
1111

1212
import java.util.*;
13+
import java.util.logging.Level;
1314
import java.util.logging.Logger;
1415

1516
/**
@@ -324,7 +325,7 @@ private void onevent(Packet<JSONArray> packet) {
324325
}
325326

326327
if (this.connected) {
327-
if (args.size() == 0) return;
328+
if (args.isEmpty()) return;
328329
String event = args.remove(0).toString();
329330
super.emit(event, args.toArray());
330331
} else {
@@ -464,9 +465,10 @@ private static Object[] toArray(JSONArray array) {
464465
try {
465466
v = array.get(i);
466467
} catch (JSONException e) {
468+
logger.log(Level.WARNING, "An error occured while retrieving data from JSONArray", e);
467469
v = null;
468470
}
469-
data[i] = v == JSONObject.NULL ? null : v;
471+
data[i] = JSONObject.NULL.equals(v) ? null : v;
470472
}
471473
return data;
472474
}

‎src/main/java/io/socket/hasbinary/HasBinary.java‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,15 @@
33
import org.json.JSONArray;
44
import org.json.JSONException;
55
import org.json.JSONObject;
6+
import java.util.logging.Level;
7+
import java.util.logging.Logger;
68

79
import java.util.Iterator;
810

911
public class HasBinary {
10-
12+
13+
private static final Logger logger = Logger.getLogger(HasBinary.class.getName());
14+
1115
private HasBinary() {}
1216

1317
public static boolean hasBinary(Object data) {
@@ -29,6 +33,7 @@ private static boolean _hasBinary(Object obj) {
2933
try {
3034
v = _obj.isNull(i) ? null : _obj.get(i);
3135
} catch (JSONException e) {
36+
logger.log(Level.WARNING, "An error occured while retrieving data from JSONArray", e);
3237
return false;
3338
}
3439
if (_hasBinary(v)) {
@@ -44,7 +49,8 @@ private static boolean _hasBinary(Object obj) {
4449
try {
4550
v = _obj.get(key);
4651
} catch (JSONException e) {
47-
return false;
52+
logger.log(Level.WARNING, "An error occured while retrieving data from JSONObject", e);
53+
return false;
4854
}
4955
if (_hasBinary(v)) {
5056
return true;

‎src/main/java/io/socket/parser/Binary.java‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,16 @@
77
import java.util.ArrayList;
88
import java.util.Iterator;
99
import java.util.List;
10+
import java.util.logging.Level;
11+
import java.util.logging.Logger;
1012

1113
public class Binary {
1214

1315
private static final String KEY_PLACEHOLDER = "_placeholder";
1416

1517
private static final String KEY_NUM = "num";
16-
18+
19+
private static final Logger logger = Logger.getLogger(Binary.class.getName());
1720

1821
@SuppressWarnings("unchecked")
1922
public static DeconstructedPacket deconstructPacket(Packet packet) {
@@ -37,6 +40,7 @@ private static Object _deconstructPacket(Object data, List<byte[]> buffers) {
3740
placeholder.put(KEY_PLACEHOLDER, true);
3841
placeholder.put(KEY_NUM, buffers.size());
3942
} catch (JSONException e) {
43+
logger.log(Level.WARNING, "An error occured while putting data to JSONObject", e);
4044
return null;
4145
}
4246
buffers.add((byte[])data);
@@ -49,6 +53,7 @@ private static Object _deconstructPacket(Object data, List<byte[]> buffers) {
4953
try {
5054
newData.put(i, _deconstructPacket(_data.get(i), buffers));
5155
} catch (JSONException e) {
56+
logger.log(Level.WARNING, "An error occured while putting packet data to JSONObject", e);
5257
return null;
5358
}
5459
}
@@ -62,6 +67,7 @@ private static Object _deconstructPacket(Object data, List<byte[]> buffers) {
6267
try {
6368
newData.put(key, _deconstructPacket(_data.get(key), buffers));
6469
} catch (JSONException e) {
70+
logger.log(Level.WARNING, "An error occured while putting data to JSONObject", e);
6571
return null;
6672
}
6773
}
@@ -85,6 +91,7 @@ private static Object _reconstructPacket(Object data, byte[][] buffers) {
8591
try {
8692
_data.put(i, _reconstructPacket(_data.get(i), buffers));
8793
} catch (JSONException e) {
94+
logger.log(Level.WARNING, "An error occured while putting packet data to JSONObject", e);
8895
return null;
8996
}
9097
}
@@ -101,6 +108,7 @@ private static Object _reconstructPacket(Object data, byte[][] buffers) {
101108
try {
102109
_data.put(key, _reconstructPacket(_data.get(key), buffers));
103110
} catch (JSONException e) {
111+
logger.log(Level.WARNING, "An error occured while putting data to JSONObject", e);
104112
return null;
105113
}
106114
}

‎src/main/java/io/socket/parser/Parser.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import java.util.ArrayList;
88
import java.util.Arrays;
99
import java.util.List;
10+
import java.util.logging.Level;
1011
import java.util.logging.Logger;
1112

1213
public class Parser {
@@ -227,6 +228,7 @@ private static Packet decodeString(String str) {
227228
str.charAt(++i);
228229
p.data = new JSONTokener(str.substring(i)).nextValue();
229230
} catch (JSONException e) {
231+
logger.log(Level.WARNING, "An error occured while retrieving data from JSONTokener", e);
230232
return error();
231233
}
232234
}

0 commit comments

Comments
 (0)