lxy/redkale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
Redkale
2017-05-25 17:18:20 +08:00
parent 27b67cde0e
commit 03bcea30df
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/org/redkale/net/http/WebSocket.java
View File

@@ -134,6 +134,8 @@ public abstract class WebSocket<G extends Serializable, T> {
return ((CompletableFuture) message).thenCompose((json) -> { return ((CompletableFuture) message).thenCompose((json) -> {
if (json == null || json instanceof CharSequence || json instanceof byte[]) { if (json == null || json instanceof CharSequence || json instanceof byte[]) {
return sendPacket(new WebSocketPacket((Serializable) json, last)); return sendPacket(new WebSocketPacket((Serializable) json, last));
} else if (message instanceof WebSocketPacket) {
return sendPacket((WebSocketPacket) message);
} else { } else {
return sendPacket(new WebSocketPacket(_jsonConvert, json, last)); return sendPacket(new WebSocketPacket(_jsonConvert, json, last));
} }
@@ -141,6 +143,8 @@ public abstract class WebSocket<G extends Serializable, T> {
} }
if (message == null || message instanceof CharSequence || message instanceof byte[]) { if (message == null || message instanceof CharSequence || message instanceof byte[]) {
return sendPacket(new WebSocketPacket((Serializable) message, last)); return sendPacket(new WebSocketPacket((Serializable) message, last));
} else if (message instanceof WebSocketPacket) {
return sendPacket((WebSocketPacket) message);
} else { } else {
return sendPacket(new WebSocketPacket(_jsonConvert, message, last)); return sendPacket(new WebSocketPacket(_jsonConvert, message, last));
} }

4
src/org/redkale/net/http/WebSocketGroup.java
View File

@@ -120,7 +120,9 @@ public final class WebSocketGroup {
} }
public final CompletableFuture<Integer> sendEach(Object message, boolean last) { public final CompletableFuture<Integer> sendEach(Object message, boolean last) {
if (message != null && !(message instanceof byte[]) && !(message instanceof CharSequence)) { if (message instanceof WebSocketPacket) {
return sendEach((WebSocketPacket) message);
} else if (message != null && !(message instanceof byte[]) && !(message instanceof CharSequence)) {
message = recentWebSocket._jsonConvert.convertTo(message); message = recentWebSocket._jsonConvert.convertTo(message);
} }
return sendEach(new WebSocketPacket((Serializable) message, last)); return sendEach(new WebSocketPacket((Serializable) message, last));