Polish contribution

sbrannen · sbrannen · commit a832c98cedc5 · 2022-11-22T14:31:49.000+01:00
See gh-29460
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
@@ -231,8 +231,11 @@ else if (validateIfUnmodifiedSince(lastModifiedTimestamp)) {
 	}
 
 	private boolean validateIfMatch(@Nullable String eTag) {
+		if (SAFE_METHODS.contains(getRequest().getMethod())) {
+			return false;
+		}
 		Enumeration<String> 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);

Original file line number	Diff line number	Diff line change
`@@ -231,8 +231,11 @@ else if (validateIfUnmodifiedSince(lastModifiedTimestamp)) {`
`231`	`231`	`}`
`232`	`232`
`233`	`233`	`private boolean validateIfMatch(@Nullable String eTag) {`
	`234`	`+ if (SAFE_METHODS.contains(getRequest().getMethod())) {`
	`235`	`+ return false;`
	`236`	`+ }`
`234`	`237`	`Enumeration<String> ifMatchHeaders = getRequest().getHeaders(HttpHeaders.IF_MATCH);`
`235`		`- if (SAFE_METHODS.contains(getRequest().getMethod()) \|\| !ifMatchHeaders.hasMoreElements()) {`
	`238`	`+ if (!ifMatchHeaders.hasMoreElements()) {`
`236`	`239`	`return false;`
`237`	`240`	`}`
`238`	`241`	`this.notModified = matchRequestedETags(ifMatchHeaders, eTag, false);`