spring/spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework.git synced 2026-09-26 08:59:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '7.0.x'

Browse Source
This commit is contained in:
Brian Clozel
2026-08-27 14:37:23 +02:00
parent 6e9534df4d 3170dd5714
commit 7daf1013aa
3 changed files with 47 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-web/src/testFixtures/java/org/springframework/web/testfixture/servlet/MockHttpServletRequest.java
+10 -2
View File
@@ -251,7 +251,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
private @Nullable HttpSession session;
private boolean requestedSessionIdValid = true;
private @Nullable Boolean requestedSessionIdValid;
private boolean requestedSessionIdFromCookie = true;
@@ -1352,7 +1352,15 @@ public class MockHttpServletRequest implements HttpServletRequest {
@Override
public boolean isRequestedSessionIdValid() {
return this.requestedSessionIdValid;
if (this.requestedSessionIdValid != null) {
return this.requestedSessionIdValid;
}
String requestedId = getRequestedSessionId();
if (requestedId == null) {
return false;
}
HttpSession currentSession = getSession(false);
return (currentSession != null && requestedId.equals(currentSession.getId()));
}
public void setRequestedSessionIdFromCookie(boolean requestedSessionIdFromCookie) {