From e068119bc3f094e3ea8f9bb13399f6b952031da6 Mon Sep 17 00:00:00 2001 From: Simone Bordet Date: Thu, 25 Mar 2021 11:32:51 +0100 Subject: [PATCH] Issue #6085 Fix duplicate valid session cookies to pick first valid. Cosmetic changes. Signed-off-by: Simone Bordet --- .../eclipse/jetty/server/session/SessionHandler.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionHandler.java b/jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionHandler.java index 8a68ac008d32..b78fc3b5849f 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionHandler.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionHandler.java @@ -1621,8 +1621,7 @@ else if (!DispatcherType.REQUEST.equals(baseRequest.getDispatcherType())) if (s != null && isValid(s)) { //associate it with the request so its reference count is decremented as the - //session exits - //try this session id + //request exits requestedSessionId = id; session = s; baseRequest.enterSession(session); @@ -1660,8 +1659,11 @@ else if (!DispatcherType.REQUEST.equals(baseRequest.getDispatcherType())) throw new BadMessageException("Duplicate valid session cookies: " + requestedSessionId + " ," + id); } } - else if (LOG.isDebugEnabled()) - LOG.debug("Duplicate valid session cookie id: {}", id); + else + { + if (LOG.isDebugEnabled()) + LOG.debug("Duplicate valid session cookie id: {}", id); + } } } }