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/07/24 15:28:36 UTC

wicket git commit: WICKET-6571 BaseWebSocketBehavior should check sessionId cookie name dynamically

Repository: wicket
Updated Branches:
  refs/heads/master 7f17cf9d6 -> 9f3bbac34


WICKET-6571 BaseWebSocketBehavior should check sessionId cookie name dynamically


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

Branch: refs/heads/master
Commit: 9f3bbac34e4ba914473e04a12b77386b6a2a8186
Parents: 7f17cf9
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Tue Jul 24 18:28:00 2018 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Tue Jul 24 18:28:00 2018 +0300

----------------------------------------------------------------------
 .../org/apache/wicket/protocol/ws/api/BaseWebSocketBehavior.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/9f3bbac3/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/BaseWebSocketBehavior.java
----------------------------------------------------------------------
diff --git a/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/BaseWebSocketBehavior.java b/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/BaseWebSocketBehavior.java
index 5711e45..6dca08f 100644
--- a/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/BaseWebSocketBehavior.java
+++ b/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/api/BaseWebSocketBehavior.java
@@ -173,7 +173,8 @@ public class BaseWebSocketBehavior extends Behavior
 		else if (containerRequest instanceof HttpServletRequest)
 		{
 			CookieUtils cookieUtils = new CookieUtils();
-			final Cookie jsessionid = cookieUtils.getCookie("JSESSIONID");
+			final String jsessionCookieName = application.getServletContext().getSessionCookieConfig().getName();
+			final Cookie jsessionid = cookieUtils.getCookie(jsessionCookieName);
 			HttpServletRequest httpServletRequest = (HttpServletRequest) containerRequest;
 			if (jsessionid == null || httpServletRequest.isRequestedSessionIdValid() == false)
 			{