From d2960b570f1a3d9e58d76db7b6d00b6be570972f Mon Sep 17 00:00:00 2001 From: Eleftheria Stein Date: Thu, 25 Mar 2021 09:55:32 +0200 Subject: [PATCH] Polish gh-1798 - Should throw IllegalStateException --- .../session/web/http/SessionRepositoryFilter.java | 2 +- .../session/web/http/SessionRepositoryFilterTests.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/spring-session-core/src/main/java/org/springframework/session/web/http/SessionRepositoryFilter.java b/spring-session-core/src/main/java/org/springframework/session/web/http/SessionRepositoryFilter.java index b8e89306..d933fddc 100644 --- a/spring-session-core/src/main/java/org/springframework/session/web/http/SessionRepositoryFilter.java +++ b/spring-session-core/src/main/java/org/springframework/session/web/http/SessionRepositoryFilter.java @@ -312,7 +312,7 @@ public class SessionRepositoryFilter extends OncePerRequestFi } if (SessionRepositoryFilter.this.httpSessionIdResolver instanceof CookieHttpSessionIdResolver && this.response.isCommitted()) { - throw new IllegalArgumentException("Cannot create a session after the response has been committed"); + throw new IllegalStateException("Cannot create a session after the response has been committed"); } if (SESSION_LOGGER.isDebugEnabled()) { SESSION_LOGGER.debug( diff --git a/spring-session-core/src/test/java/org/springframework/session/web/http/SessionRepositoryFilterTests.java b/spring-session-core/src/test/java/org/springframework/session/web/http/SessionRepositoryFilterTests.java index 77289632..4beb17b0 100644 --- a/spring-session-core/src/test/java/org/springframework/session/web/http/SessionRepositoryFilterTests.java +++ b/spring-session-core/src/test/java/org/springframework/session/web/http/SessionRepositoryFilterTests.java @@ -62,6 +62,7 @@ import org.springframework.test.util.ReflectionTestUtils; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; +import static org.assertj.core.api.Assertions.assertThatIllegalStateException; import static org.assertj.core.api.Assertions.fail; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyString; @@ -425,7 +426,7 @@ class SessionRepositoryFilterTests { @Test void doFilterGetSessionNewWhenResponseCommittedThenException() { - assertThatIllegalArgumentException().isThrownBy(() -> doFilter(new DoInFilter() { + assertThatIllegalStateException().isThrownBy(() -> doFilter(new DoInFilter() { @Override public void doFilter(HttpServletRequest wrappedRequest, HttpServletResponse wrappedResponse) throws IOException {