From 204a50ee6c9c77ec1f6be479af2e979991130da1 Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@pivotal.io>
Date: Mon, 29 Aug 2016 21:06:35 -0400
Subject: [PATCH] Fix compile issue

---
 .../web/servlet/resource/ResourceHttpRequestHandler.java     | 5 -----
 1 file changed, 5 deletions(-)

diff --git 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
index ad0ee8dca8..4603296ce0 100644
--- 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);
 	}