Issue #9046 Fix tck session invalidate test (#9047)

jetty · Dec 13, 2022 · f139b66 · f139b66
1 parent e16b794
commit f139b66
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...etty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletContextRequest.java b/...etty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/ServletContextRequest.java
@@ -696,7 +696,7 @@ public boolean isRequestedSessionIdValid()
             if (getRequestedSessionId() == null || _coreSession == null)
                 return false;
             //check requestedId (which may have worker suffix) against the actual session id
-            return getSessionManager().getSessionIdManager().getId(getRequestedSessionId()).equals(_coreSession.getId());
+            return _coreSession.isValid() && getSessionManager().getSessionIdManager().getId(getRequestedSessionId()).equals(_coreSession.getId());
         }
 
         @Override

diff --git a/jetty-ee9/jetty-ee9-nested/src/main/java/org/eclipse/jetty/ee9/nested/Request.java b/jetty-ee9/jetty-ee9-nested/src/main/java/org/eclipse/jetty/ee9/nested/Request.java
@@ -1511,7 +1511,7 @@ public boolean isRequestedSessionIdValid()
         if (getRequestedSessionId() == null || _coreSession == null)
             return false;
 
-        return (_sessionManager.getSessionIdManager().getId(getRequestedSessionId()).equals(_coreSession.getId()));
+        return (_coreSession.isValid() &&  _sessionManager.getSessionIdManager().getId(getRequestedSessionId()).equals(_coreSession.getId()));
     }
 
     @Override