Merge remote-tracking branch 'origin/master' into patchy

This commit is contained in:
zaxar163 2019-01-03 12:20:05 +04:00
commit 48e57b3c45

View file

@ -27,7 +27,7 @@ public interface Listener {
void onDisconnect(Exception e); void onDisconnect(Exception e);
boolean onHandshake(long session, Integer type); boolean onHandshake(long session, int type);
} }
private static final ThreadFactory THREAD_FACTORY = r -> CommonHelper.newThread("Network Thread", true, r); private static final ThreadFactory THREAD_FACTORY = r -> CommonHelper.newThread("Network Thread", true, r);
@ -76,7 +76,7 @@ public void close() {
listener.onDisconnect(e); listener.onDisconnect(e);
} }
/*package*/ boolean onHandshake(long session, Integer type) { /*package*/ boolean onHandshake(long session, int type) {
return listener == null || listener.onHandshake(session, type); return listener == null || listener.onHandshake(session, type);
} }