Skip to content

Commit

Permalink
#6251 handle partial WebSocket messages (#6622)
Browse files Browse the repository at this point in the history
Signed-off-by: Yevhen Vydolob <evidolob@codenvy.com>
  • Loading branch information
evidolob committed Oct 10, 2017
1 parent f65836a commit 17f374a
Showing 1 changed file with 16 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
import java.util.concurrent.ConcurrentHashMap;
import javax.websocket.CloseReason;
import javax.websocket.OnClose;
import javax.websocket.OnError;
Expand All @@ -39,6 +40,7 @@ public abstract class BasicWebSocketEndpoint {
private final MessagesReSender reSender;
private final WebSocketMessageReceiver receiver;
private final WebsocketIdService identificationService;
private final Map<Session, StringBuffer> sessionMessagesBuffer = new ConcurrentHashMap<>();

public BasicWebSocketEndpoint(
WebSocketSessionRegistry registry,
Expand All @@ -63,9 +65,22 @@ public void onOpen(Session session) {

registry.add(combinedEndpointId, session);
reSender.resend(combinedEndpointId);
sessionMessagesBuffer.put(session, new StringBuffer());
}

@OnMessage
public void onMessage(String messagePart, boolean last, Session session) {
StringBuffer buffer = sessionMessagesBuffer.get(session);
buffer.append(messagePart);
if (last) {
try {
onMessage(buffer.toString(), session);
} finally {
buffer.setLength(0);
}
}
}

public void onMessage(String message, Session session) {
Optional<String> endpointIdOptional = registry.get(session);

Expand Down Expand Up @@ -98,6 +113,7 @@ public void onClose(CloseReason closeReason, Session session) {
LOG.debug("Close reason: {}:{}", closeReason.getReasonPhrase(), closeReason.getCloseCode());

registry.remove(combinedEndpointId);
sessionMessagesBuffer.remove(session);
} else {
LOG.warn("Closing unidentified session");
}
Expand Down

0 comments on commit 17f374a

Please sign in to comment.