Skip to content

Commit 766a2ec

Browse files
aogburnfl4via
authored andcommitted
[UNDERTOW-2313] NPE occurs in session invalidation if a session creation attempt hits UNDERTOW-1971
1 parent e6acf35 commit 766a2ec

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

core/src/main/java/io/undertow/server/session/InMemorySessionManager.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,8 +175,10 @@ public Session createSession(final HttpServerExchange serverExchange, final Sess
175175
String sessionID = config.findSessionId(serverExchange);
176176
final SessionImpl session = new SessionImpl(this, config, serverExchange.getIoThread(), serverExchange.getConnection().getWorker(), defaultSessionTimeout);
177177
if (sessionID != null) {
178-
if (!saveSessionID(sessionID, session))
178+
if (!saveSessionID(sessionID, session)) {
179+
session.destroy();
179180
throw UndertowMessages.MESSAGES.sessionWithIdAlreadyExists(sessionID);
181+
}
180182
// else: succeeded to use requested session id
181183
} else {
182184
sessionID = createAndSaveNewID(session);

0 commit comments

Comments
 (0)