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 2016/11/19 21:47:08 UTC
wicket git commit: WICKET-6282 Make native web socket message classes
serializable
Repository: wicket
Updated Branches:
refs/heads/master 7fe1de56b -> b3429733f
WICKET-6282 Make native web socket message classes serializable
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/b3429733
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/b3429733
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/b3429733
Branch: refs/heads/master
Commit: b3429733fe30fee159b7d2ac5f4235fb3898638e
Parents: 7fe1de5
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Sat Nov 19 22:46:14 2016 +0100
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Sat Nov 19 22:47:00 2016 +0100
----------------------------------------------------------------------
.../wicket/protocol/ws/api/message/AbstractClientMessage.java | 6 +++---
.../wicket/protocol/ws/api/message/IWebSocketMessage.java | 4 +++-
2 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/b3429733/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/message/AbstractClientMessage.java
----------------------------------------------------------------------
diff --git a/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/message/AbstractClientMessage.java b/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/message/AbstractClientMessage.java
index 7e3234c..11b49d3 100644
--- a/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/message/AbstractClientMessage.java
+++ b/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/message/AbstractClientMessage.java
@@ -25,20 +25,20 @@ import org.apache.wicket.util.lang.Args;
*/
public abstract class AbstractClientMessage implements IWebSocketMessage
{
- private final Application application;
+ private final String applicationName;
private final String sessionId;
private final IKey key;
public AbstractClientMessage(Application application, String sessionId, IKey key)
{
- this.application = Args.notNull(application, "application");
+ this.applicationName = Args.notNull(application, "application").getName();
this.sessionId = Args.notNull(sessionId, "sessionId");
this.key = Args.notNull(key, "key");
}
public Application getApplication()
{
- return application;
+ return Application.get(applicationName);
}
public String getSessionId()
http://git-wip-us.apache.org/repos/asf/wicket/blob/b3429733/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/message/IWebSocketMessage.java
----------------------------------------------------------------------
diff --git a/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/message/IWebSocketMessage.java b/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/message/IWebSocketMessage.java
index 0825e21..955b13e 100644
--- a/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/message/IWebSocketMessage.java
+++ b/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/message/IWebSocketMessage.java
@@ -16,11 +16,13 @@
*/
package org.apache.wicket.protocol.ws.api.message;
+import org.apache.wicket.util.io.IClusterable;
+
/**
* A marker interface for all message types
*
* @since 6.0
*/
-public interface IWebSocketMessage
+public interface IWebSocketMessage extends IClusterable
{
}