Further workaround for WICKET-6588

Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/88a5746e
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/88a5746e
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/88a5746e

Branch: refs/heads/2_1_X
Commit: 88a5746e0b0c6bb3121ab0ebeb01ca4b3edc7ebd
Parents: b4f448e
Author: Francesco Chicchiriccò <[email protected]>
Authored: Fri Sep 21 09:17:55 2018 +0200
Committer: Francesco Chicchiriccò <[email protected]>
Committed: Fri Sep 21 09:17:55 2018 +0200

----------------------------------------------------------------------
 .../client/console/topology/TopologyWebSocketBehavior.java      | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/88a5746e/client/console/src/main/java/org/apache/syncope/client/console/topology/TopologyWebSocketBehavior.java
----------------------------------------------------------------------
diff --git 
a/client/console/src/main/java/org/apache/syncope/client/console/topology/TopologyWebSocketBehavior.java
 
b/client/console/src/main/java/org/apache/syncope/client/console/topology/TopologyWebSocketBehavior.java
index fbfdd19..1b1a448 100644
--- 
a/client/console/src/main/java/org/apache/syncope/client/console/topology/TopologyWebSocketBehavior.java
+++ 
b/client/console/src/main/java/org/apache/syncope/client/console/topology/TopologyWebSocketBehavior.java
@@ -82,7 +82,10 @@ public class TopologyWebSocketBehavior extends 
WebSocketBehavior {
             sessionId = component.getSession().getId();
         } else if (containerRequest instanceof HttpServletRequest) {
             CookieUtils cookieUtils = new CookieUtils();
-            String jsessionCookieName = 
application.getServletContext().getSessionCookieConfig().getName();
+            String jsessionCookieName = null;
+            if (application.getServletContext().getSessionCookieConfig() != 
null) {
+                jsessionCookieName = 
application.getServletContext().getSessionCookieConfig().getName();
+            }
             if (jsessionCookieName == null) {
                 jsessionCookieName = "JSESSIONID";
             }

Reply via email to