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 2018/01/01 20:26:32 UTC
wicket git commit: WICKET-6483 JavaxUpgradeHttpRequest can cause
NullPointerException
Repository: wicket
Updated Branches:
refs/heads/master 39d7ac1f8 -> 4b8ac4c8c
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
Revert the change to use 'request.getSession(false) because this breaks WicketTester/WebSocketTester infrastructure
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/4b8ac4c8
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/4b8ac4c8
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/4b8ac4c8
Branch: refs/heads/master
Commit: 4b8ac4c8cc14f2926312e2572fee4299256e7b11
Parents: 39d7ac1
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon Jan 1 22:24:46 2018 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon Jan 1 22:24:46 2018 +0200
----------------------------------------------------------------------
.../apache/wicket/protocol/ws/api/AbstractWebSocketProcessor.java | 2 +-
.../org/apache/wicket/protocol/ws/util/tester/WebSocketTester.java | 2 +-
.../protocol/ws/util/tester/WebSocketTesterProcessorTest.java | 1 -
3 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/4b8ac4c8/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 550423d..ca3569d 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(false);
+ final HttpSession httpSession = request.getSession(true);
if (httpSession == null)
{
throw new IllegalStateException("There is no HTTP Session bound. Without a session Wicket won't be " +
http://git-wip-us.apache.org/repos/asf/wicket/blob/4b8ac4c8/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/util/tester/WebSocketTester.java
----------------------------------------------------------------------
diff --git a/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/util/tester/WebSocketTester.java b/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/util/tester/WebSocketTester.java
index f45c826..f83894f 100644
--- a/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/util/tester/WebSocketTester.java
+++ b/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/util/tester/WebSocketTester.java
@@ -39,7 +39,7 @@ public class WebSocketTester
/**
* Constructor.
- * Prepares a WebSockConnection that will be used to send messages from the client (the test case)
+ * Prepares a WebSocketConnection that will be used to send messages from the client (the test case)
* to the server.
*
* @param page
http://git-wip-us.apache.org/repos/asf/wicket/blob/4b8ac4c8/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/WebSocketTesterProcessorTest.java
----------------------------------------------------------------------
diff --git a/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/WebSocketTesterProcessorTest.java b/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/WebSocketTesterProcessorTest.java
index 5956299..0a7dd10 100644
--- a/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/WebSocketTesterProcessorTest.java
+++ b/wicket-native-websocket/wicket-native-websocket-core/src/test/java/org/apache/wicket/protocol/ws/util/tester/WebSocketTesterProcessorTest.java
@@ -100,7 +100,6 @@ public class WebSocketTesterProcessorTest extends Assert
assertTrue(TestWebSocketResource.ON_ABORT_CALLED.get());
}
-// @Ignore
@Test
public void onConnectMultipleOrigins()
{