client: session timeout set after server is started

Author: marcaurele

client/src/main/java/org/apache/cloudstack/ServerDaemon.java

@@ -24,6 +24,7 @@
 import java.net.URL;
 import java.util.Properties;
 
+import com.cloud.utils.Pair;
 import org.apache.commons.daemon.Daemon;
 import org.apache.commons.daemon.DaemonContext;
 import org.eclipse.jetty.jmx.MBeanContainer;
@@ -176,7 +177,8 @@ public void start() throws Exception {
         createHttpConnector(httpConfig);
 
         // Setup handlers
-        server.setHandler(createHandlers());
+        Pair<SessionHandler,HandlerCollection> pair = createHandlers();
+        server.setHandler(pair.second());
 
         // Extra config options
         server.setStopAtShutdown(true);
@@ -185,6 +187,8 @@ public void start() throws Exception {
         createHttpsConnector(httpConfig);
 
         server.start();
+        // Must set the session timeout after the server has started
+        pair.first().setMaxInactiveInterval(sessionTimeout * 60);
         server.join();
     }
 
@@ -237,15 +241,11 @@ private void createHttpsConnector(final HttpConfiguration httpConfig) {
         }
     }
 
-    private HandlerCollection createHandlers() {
+    private Pair<SessionHandler,HandlerCollection> createHandlers() {
         final WebAppContext webApp = new WebAppContext();
         webApp.setContextPath(contextPath);
         webApp.setInitParameter("org.eclipse.jetty.servlet.Default.dirAllowed", "false");
 
-        final  SessionHandler sessionHandler = new SessionHandler();
-        sessionHandler.setMaxInactiveInterval(sessionTimeout * 60);
-        webApp.setSessionHandler(sessionHandler);
-
         // GZIP handler
         final GzipHandler gzipHandler = new GzipHandler();
         gzipHandler.addIncludedMimeTypes("text/html", "text/xml", "text/css", "text/plain", "text/javascript", "application/javascript", "application/json", "application/xml");
@@ -263,14 +263,14 @@ private HandlerCollection createHandlers() {
         final RequestLogHandler log = new RequestLogHandler();
         log.setRequestLog(createRequestLog());
 
-        // Redirect root context handler
+        // Redirect root context handler_war
         MovedContextHandler rootRedirect = new MovedContextHandler();
         rootRedirect.setContextPath("/");
         rootRedirect.setNewContextURL(contextPath);
         rootRedirect.setPermanent(true);
 
         // Put rootRedirect at the end!
-        return new HandlerCollection(log, gzipHandler, rootRedirect);
+        return new Pair<>(webApp.getSessionHandler(), new HandlerCollection(log, gzipHandler, rootRedirect));
     }
 
     private RequestLog createRequestLog() {