Issue #6085 Fix duplicate valid session cookies to pick first valid.

Cosmetic changes. Signed-off-by: Simone Bordet <[email protected]>
jetty · Mar 25, 2021 · c4e3f54 · c4e3f54
1 parent eb7e588
commit c4e3f54
Showing 1 changed file with 6 additions and 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
@@ -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);
+                            }
                         }
                     }
                 }