Fix compile issue

204a50ee · Rossen Stoyanchev · 4d3c3056 · 204a50ee
隐藏空白更改
内联并排

Showing with 0 addition and 5 deletion

spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandler.java ...work/web/servlet/resource/ResourceHttpRequestHandler.java +0 -5

未找到文件。
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandler.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandler.java
@@ -515,11 +515,6 @@ public class ResourceHttpRequestHandler extends WebContentGenerator
 	 * @return the corresponding media type, or {@code null} if none found
 	 */
 	protected MediaType getMediaType(HttpServletRequest request, Resource resource) {
-		// For backwards compatibility
-		MediaType mediaType = getMediaType(resource);
-		if (mediaType != null) {
-			return mediaType;
-		}
 		return this.pathExtensionStrategy.getMediaTypeForResource(resource);
 	}