Use hasLength rather than hasText

snicoll · snicoll · commit 64e79ba6922e · 2014-12-30T15:39:48.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
@@ -316,7 +316,7 @@ else if (resource instanceof ServletContextResource) {
 			locationPath = location.getURL().getPath();
 		}
 		locationPath = (locationPath.endsWith("/") ||
-				!StringUtils.hasText(locationPath) ? locationPath : locationPath + "/");
+				!StringUtils.hasLength(locationPath) ? locationPath : locationPath + "/");
 		if (!resourcePath.startsWith(locationPath)) {
 			return false;
 		}

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