Merge pull request #1520 from ropalka/UNDERTOW-2316

[UNDERTOW-2316] Unify InMemorySessionManager with DistributableSessionManager - allow null exchanges
undertow-io · Oct 11, 2023 · cc76a04 · cc76a04
2 parents d8b9bea + 15b4159
commit cc76a04
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/core/src/main/java/io/undertow/server/session/InMemorySessionManager.java b/core/src/main/java/io/undertow/server/session/InMemorySessionManager.java
@@ -228,15 +228,18 @@ private String createAndSaveNewID(SessionImpl session) {
     public Session getSession(final HttpServerExchange serverExchange, final SessionConfig config) {
         if (serverExchange != null) {
             SessionImpl newSession = serverExchange.getAttachment(NEW_SESSION);
-            if(newSession != null) {
+            if (newSession != null) {
                 return newSession;
             }
-        } else {
-            return null;
         }
+
+        if (config == null) {
+            throw UndertowMessages.MESSAGES.couldNotFindSessionCookieConfig();
+        }
+
         String sessionId = config.findSessionId(serverExchange);
         InMemorySessionManager.SessionImpl session = (SessionImpl) getSession(sessionId);
-        if(session != null && serverExchange != null) {
+        if (session != null && serverExchange != null) {
             session.requestStarted(serverExchange);
         }
         return session;