From a832c98cedc56690ad606b53f497814370792d12 Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Tue, 22 Nov 2022 14:23:49 +0100 Subject: [PATCH] Polish contribution See gh-29460 --- .../web/context/request/ServletWebRequest.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/spring-web/src/main/java/org/springframework/web/context/request/ServletWebRequest.java b/spring-web/src/main/java/org/springframework/web/context/request/ServletWebRequest.java index ba27169d02..4d5eda127a 100644 --- a/spring-web/src/main/java/org/springframework/web/context/request/ServletWebRequest.java +++ b/spring-web/src/main/java/org/springframework/web/context/request/ServletWebRequest.java @@ -231,8 +231,11 @@ public class ServletWebRequest extends ServletRequestAttributes implements Nativ } private boolean validateIfMatch(@Nullable String eTag) { + if (SAFE_METHODS.contains(getRequest().getMethod())) { + return false; + } Enumeration ifMatchHeaders = getRequest().getHeaders(HttpHeaders.IF_MATCH); - if (SAFE_METHODS.contains(getRequest().getMethod()) || !ifMatchHeaders.hasMoreElements()) { + if (!ifMatchHeaders.hasMoreElements()) { return false; } this.notModified = matchRequestedETags(ifMatchHeaders, eTag, false);