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 2017/12/30 22:34:19 UTC

wicket git commit: WICKET-6483 JavaxUpgradeHttpRequest can cause NullPointerException

Repository: wicket
Updated Branches:
  refs/heads/master e4ee449e5 -> 02808f7d0


WICKET-6483 JavaxUpgradeHttpRequest can cause NullPointerException

WICKET-6493 WebSocket SessionIds are wrong (HttpSession one used instead of Websocket one) + NPE if no HttpSession is found during Handshake Request

Use HttpServletRequest.getSession(false) to make it more explicit that it is not possible to create a new HttpSession in WebSocket request.
If the session is existing it will be used, otherwise an exception will be thrown explaining the problem.


Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/02808f7d
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/02808f7d
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/02808f7d

Branch: refs/heads/master
Commit: 02808f7d08faab05432515b29d8e6e25e5343fe0
Parents: e4ee449
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Sun Dec 31 00:32:36 2017 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Sun Dec 31 00:32:36 2017 +0200

----------------------------------------------------------------------
 .../apache/wicket/protocol/ws/api/AbstractWebSocketProcessor.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/02808f7d/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/AbstractWebSocketProcessor.java
----------------------------------------------------------------------
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..550423d 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
@@ -102,7 +102,7 @@ public abstract class AbstractWebSocketProcessor implements IWebSocketProcessor
 	 */
 	public AbstractWebSocketProcessor(final HttpServletRequest request, final WebApplication application)
 	{
-		final HttpSession httpSession = request.getSession(true);
+		final HttpSession httpSession = request.getSession(false);
 		if (httpSession == null)
 		{
 			throw new IllegalStateException("There is no HTTP Session bound. Without a session Wicket won't be " +