Restore JDK 5 compatiblity

snicoll · snicoll · commit 4bcf92f176d0 · 2014-12-30T15:34:35.000+01:00
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
@@ -315,7 +315,8 @@ else if (resource instanceof ServletContextResource) {
 			resourcePath = resource.getURL().getPath();
 			locationPath = location.getURL().getPath();
 		}
-		locationPath = (locationPath.endsWith("/") || locationPath.isEmpty() ? locationPath : locationPath + "/");
+		locationPath = (locationPath.endsWith("/") ||
+				!StringUtils.hasText(locationPath) ? locationPath : locationPath + "/");
 		if (!resourcePath.startsWith(locationPath)) {
 			return false;
 		}

Original file line number	Diff line number	Diff line change
`@@ -315,7 +315,8 @@ else if (resource instanceof ServletContextResource) {`
`315`	`315`	`resourcePath = resource.getURL().getPath();`
`316`	`316`	`locationPath = location.getURL().getPath();`
`317`	`317`	`}`
`318`		`- locationPath = (locationPath.endsWith("/") \|\| locationPath.isEmpty() ? locationPath : locationPath + "/");`
	`318`	`+ locationPath = (locationPath.endsWith("/") \|\|`
	`319`	`+ !StringUtils.hasText(locationPath) ? locationPath : locationPath + "/");`
`319`	`320`	`if (!resourcePath.startsWith(locationPath)) {`
`320`	`321`	`return false;`
`321`	`322`	`}`