[openmeetings] branch master updated: [OPENMEETINGS-1928] additional fix regarding SessionCookieConfig

[solomax]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new de48222  [OPENMEETINGS-1928] additional fix regarding 
SessionCookieConfig
de48222 is described below

commit de48222f5f60ea4b2050864e6c7778ab5f9c23c6
Author: Maxim Solodovnik <solomax...@gmail.com>
AuthorDate: Mon Sep 17 18:04:32 2018 +0700

    [OPENMEETINGS-1928] additional fix regarding SessionCookieConfig
---
 .../java/org/apache/openmeetings/db/util/ApplicationHelper.java  | 9 ++++++++-
 1 file changed, 8 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 0743e54..0ca6a37 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
@@ -63,7 +63,14 @@ public class ApplicationHelper {
                        try {
                                app = 
(WebApplication)OpenmeetingsVariables.getAppClass().newInstance();
                                app.setName("--dumb--"); //temporary name for 
temporary application
-                               ServletContext sc = new MockServletContext(app, 
null);
+                               ServletContext sc = new MockServletContext(app, 
null) {
+                                       @Override
+                                       public SessionCookieConfig 
getSessionCookieConfig() {
+                                               SessionCookieConfig cfg = new 
MockSessionCookieConfig();
+                                               
cfg.setName("_ensureApplication");
+                                               return cfg;
+                                       }
+                               };
                                XmlWebApplicationContext xmlContext = new 
XmlWebApplicationContext();
                                
xmlContext.setConfigLocation("classpath:applicationContext.xml");
                                xmlContext.setServletContext(sc);