This is an automated email from the ASF dual-hosted git repository. mgrigorov pushed a commit to branch wicket-7.x in repository https://gitbox.apache.org/repos/asf/wicket.git
The following commit(s) were added to refs/heads/wicket-7.x by this push: new 716e10e WICKET-6758 NPE in AbstractWebSocketProcessor after session times out 716e10e is described below commit 716e10e5dc79e0a91520733c509e1b24c6e03e81 Author: Martin Tzvetanov Grigorov <mgrigo...@apache.org> AuthorDate: Mon Mar 23 09:31:30 2020 +0200 WICKET-6758 NPE in AbstractWebSocketProcessor after session times out Return early if there is no Wicket Session while processing WebSocket message (cherry picked from commit 1f6f8ba54bc921c11e1b8462dc03f33e94f5b06f) --- .../apache/wicket/protocol/ws/api/AbstractWebSocketProcessor.java | 7 +++++++ 1 file changed, 7 insertions(+) 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 8cad7a8..36bafd9 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 @@ -245,6 +245,13 @@ public abstract class AbstractWebSocketProcessor implements IWebSocketProcessor session = oldSession; } + if (session == null) + { + connectionRegistry.removeConnection(application, sessionId, key); + LOG.debug("No Session could be found for session id '{}' and key '{}'!", sessionId, key); + return; + } + IPageManager pageManager = session.getPageManager(); Page page = getPage(pageManager);