[openmeetings] branch 4.0.x updated: [OPENMEETINGS-1928] cookie name is explicitely set

[solomax]

This is an automated email from the ASF dual-hosted git repository.

solomax pushed a commit to branch 4.0.x
in repository https://gitbox.apache.org/repos/asf/openmeetings.git


The following commit(s) were added to refs/heads/4.0.x by this push:
     new cd99e1a  [OPENMEETINGS-1928] cookie name is explicitely set
cd99e1a is described below

commit cd99e1a509dfc4ca738ff3f0e2da514a08c1078f
Author: Maxim Solodovnik <solomax...@gmail.com>
AuthorDate: Mon Sep 17 23:18:11 2018 +0700

    [OPENMEETINGS-1928] cookie name is explicitely set
---
 .../main/java/org/apache/openmeetings/db/util/ApplicationHelper.java  | 2 +-
 .../src/main/java/org/apache/openmeetings/web/app/Application.java    | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git 
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/ApplicationHelper.java
 
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/ApplicationHelper.java
index 969bf14..fe04331 100644
--- 
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/ApplicationHelper.java
+++ 
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/ApplicationHelper.java
@@ -80,7 +80,7 @@ public class ApplicationHelper {
                                        @Override
                                        public SessionCookieConfig 
getSessionCookieConfig() {
                                                SessionCookieConfig cfg = new 
MockSessionCookieConfig();
-                                               
cfg.setName("_ensureApplication");
+                                               
cfg.setName("_ensureApplication"); // FIXME TODO WICKET-6588
                                                return cfg;
                                        }
                                });
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
index 3274c99..8d4f556 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
@@ -155,6 +155,10 @@ public class Application extends 
AuthenticatedWebApplication implements IApplica
                getSecuritySettings().setAuthenticationStrategy(new 
OmAuthenticationStrategy());
                
getApplicationSettings().setAccessDeniedPage(AccessDeniedPage.class);
 
+               // FIXME TODO WICKET-6588
+               if (getServletContext().getSessionCookieConfig().getName() == 
null) {
+                       
getServletContext().getSessionCookieConfig().setName("OMSESSIONID");
+               }
                
hazelcast.getCluster().getLocalMember().setStringAttribute(NAME_ATTR_KEY, 
hazelcast.getName());
                hazelWsTopic = hazelcast.getTopic("default");
                hazelWsTopic.addMessageListener(msg -> {