adds null check for session cookie config

finos · Oct 9, 2024 · c6c2a89 · c6c2a89
1 parent 32633fb
commit c6c2a89
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/legend-shared-server/src/main/java/org/finos/legend/server/shared/staticserver/Server.java b/legend-shared-server/src/main/java/org/finos/legend/server/shared/staticserver/Server.java
@@ -122,8 +122,11 @@ public void run(org.finos.legend.server.shared.staticserver.StaticServerConfigur
     private void makeSessionCookieSecure( ContextHandler.Context servletContext)
     {
         SessionCookieConfig sessionCookieConfig = servletContext.getSessionCookieConfig();
-        sessionCookieConfig.setSecure(true);
-        sessionCookieConfig.setHttpOnly(true);
+        if(sessionCookieConfig != null)
+        {
+            sessionCookieConfig.setSecure(true);
+            sessionCookieConfig.setHttpOnly(true);
+        }
         servletContext.setAttribute(HttpCookie.SAME_SITE_DEFAULT_ATTRIBUTE, "STRICT");
     }
 }