From 5aab6761ff53f73661fa3c8ada9f7d0b4db3c373 Mon Sep 17 00:00:00 2001 From: Serge Rider Date: Thu, 16 Dec 2021 19:23:34 +0300 Subject: [PATCH] CB-1394 Fix Jetty session ID manager init --- .../cloudbeaver/server/jetty/CBJettyServer.java | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/jetty/CBJettyServer.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/jetty/CBJettyServer.java index a60a219acc..f8390a82d2 100644 --- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/jetty/CBJettyServer.java +++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/jetty/CBJettyServer.java @@ -39,7 +39,16 @@ public class CBJettyServer { public void runServer() { CBApplication application = CBApplication.getInstance(); try { - Server server = new Server(application.getServerPort()); + Server server = new Server(application.getServerPort()) { + @Override + public void setSessionIdManager(SessionIdManager sessionIdManager) { + if (sessionIdManager instanceof DefaultSessionIdManager) { + // Nullify worker name to avoid dummy prefixes in session ID cookie + ((DefaultSessionIdManager) sessionIdManager).setWorkerName(null); + } + super.setSessionIdManager(sessionIdManager); + } + }; { // Handler configuration @@ -92,12 +101,6 @@ public class CBJettyServer { } private void initSessionManager(Server server, ServletContextHandler servletContextHandler) { - SessionIdManager sessionIdManager = server.getSessionIdManager(); - if (sessionIdManager instanceof DefaultSessionIdManager) { - // Nullify worker name to avoid dummy prefixes in session ID cookie - ((DefaultSessionIdManager) sessionIdManager).setWorkerName(""); - } - // Init sessions persistence Path metadataFolder = GeneralUtils.getMetadataFolder(DBWorkbench.getPlatform().getWorkspace().getAbsolutePath()); Path sessionCacheFolder = metadataFolder.resolve(SESSION_CACHE_DIR);