You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2019/02/02 22:30:31 UTC
[wicket] branch wicket-8.x updated: WICKET-6634 Save the closeCode
and message in WebSocket's ClosedMessage
This is an automated email from the ASF dual-hosted git repository.
mgrigorov pushed a commit to branch wicket-8.x
in repository https://gitbox.apache.org/repos/asf/wicket.git
The following commit(s) were added to refs/heads/wicket-8.x by this push:
new 57fd55d WICKET-6634 Save the closeCode and message in WebSocket's ClosedMessage
57fd55d is described below
commit 57fd55d4d2f31c7dc8acf8b64f46ccd68a50bc7e
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
AuthorDate: Sun Feb 3 00:30:10 2019 +0200
WICKET-6634 Save the closeCode and message in WebSocket's ClosedMessage
---
.../ws/api/AbstractWebSocketProcessor.java | 2 +-
.../protocol/ws/api/message/ClosedMessage.java | 25 +++++++++++++++++++++-
2 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/AbstractWebSocketProcessor.java b/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/AbstractWebSocketProcessor.java
index ca3569d..e502d16 100644
--- a/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/AbstractWebSocketProcessor.java
+++ b/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/AbstractWebSocketProcessor.java
@@ -185,7 +185,7 @@ public abstract class AbstractWebSocketProcessor implements IWebSocketProcessor
public void onClose(int closeCode, String message)
{
IKey key = getRegistryKey();
- broadcastMessage(new ClosedMessage(getApplication(), getSessionId(), key));
+ broadcastMessage(new ClosedMessage(getApplication(), getSessionId(), key, closeCode, message));
connectionRegistry.removeConnection(getApplication(), getSessionId(), key);
}
diff --git a/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/message/ClosedMessage.java b/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/message/ClosedMessage.java
index 9dad746..f2816cd 100644
--- a/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/message/ClosedMessage.java
+++ b/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/message/ClosedMessage.java
@@ -27,14 +27,37 @@ import org.apache.wicket.protocol.ws.api.registry.IKey;
*/
public class ClosedMessage extends AbstractClientMessage
{
+ private final int closeCode;
+
+ private final String message;
+
+ /**
+ * @deprecated This constructor is no more used by Wicket and will be removed in Wicket 9.0
+ */
+ @Deprecated
public ClosedMessage(Application application, String sessionId, IKey key)
{
+ this(application, sessionId, key, -1, "unknown");
+ }
+
+ public ClosedMessage(Application application, String sessionId, IKey key, int closeCode, String message)
+ {
super(application, sessionId, key);
+ this.closeCode = closeCode;
+ this.message = message;
+ }
+
+ public int getCloseCode() {
+ return closeCode;
+ }
+
+ public String getMessage() {
+ return message;
}
@Override
public final String toString()
{
- return "The client closed its connection";
+ return "The client closed its connection with code '" + closeCode + "' and message: '" + message + "'";
}
}