diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/JettyCoreServerHttpResponse.java b/spring-web/src/main/java/org/springframework/http/server/reactive/JettyCoreServerHttpResponse.java index 9ad748a85c3..c9ee8eeb563 100644 --- a/spring-web/src/main/java/org/springframework/http/server/reactive/JettyCoreServerHttpResponse.java +++ b/spring-web/src/main/java/org/springframework/http/server/reactive/JettyCoreServerHttpResponse.java @@ -212,9 +212,8 @@ class JettyCoreServerHttpResponse extends AbstractServerHttpResponse implements } @Override - public @Nullable SameSite getSameSite() { - // Adding non-null return site breaks tests. - return null; + public SameSite getSameSite() { + return SameSite.from(this.responseCookie.getSameSite()); } @Override