From 55faf6e3205d26a4ba693f40c1ea1cef179f31cb Mon Sep 17 00:00:00 2001 From: Bryce Yang Date: Sat, 24 Apr 2021 08:58:56 +0900 Subject: [PATCH] Use HttpMethod enums See gh-26855 --- .../org/springframework/web/servlet/DispatcherServlet.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/DispatcherServlet.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/DispatcherServlet.java index 27ae7bf7df4..1486837d7f9 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/DispatcherServlet.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/DispatcherServlet.java @@ -49,6 +49,7 @@ import org.springframework.core.annotation.AnnotationAwareOrderComparator; import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.support.PropertiesLoaderUtils; import org.springframework.core.log.LogFormatUtils; +import org.springframework.http.HttpMethod; import org.springframework.http.server.RequestPath; import org.springframework.http.server.ServletServerHttpRequest; import org.springframework.lang.Nullable; @@ -1046,8 +1047,8 @@ public class DispatcherServlet extends FrameworkServlet { // Process last-modified header, if supported by the handler. String method = request.getMethod(); - boolean isGet = "GET".equals(method); - if (isGet || "HEAD".equals(method)) { + boolean isGet = HttpMethod.GET.matches(method); + if (isGet || HttpMethod.HEAD.matches(method)) { long lastModified = ha.getLastModified(request, mappedHandler.getHandler()); if (new ServletWebRequest(request, response).checkNotModified(lastModified) && isGet) { return;