From 8196af4bc540f4648098fd460c654e35567308c2 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <jhoeller@pivotal.io>
Date: Wed, 22 Jul 2015 14:17:16 +0200
Subject: [PATCH] UriComponentsBuilder.fromUriString accepts empty URIs

Issue: SPR-13257
---
 .../java/org/springframework/web/util/UriComponentsBuilder.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-web/src/main/java/org/springframework/web/util/UriComponentsBuilder.java b/spring-web/src/main/java/org/springframework/web/util/UriComponentsBuilder.java
index 9be3f71d07..7004cfb045 100644
--- a/spring-web/src/main/java/org/springframework/web/util/UriComponentsBuilder.java
+++ b/spring-web/src/main/java/org/springframework/web/util/UriComponentsBuilder.java
@@ -183,7 +183,7 @@ public class UriComponentsBuilder implements Cloneable {
 	 * @return the new {@code UriComponentsBuilder}
 	 */
 	public static UriComponentsBuilder fromUriString(String uri) {
-		Assert.hasLength(uri, "'uri' must not be empty");
+		Assert.notNull(uri, "'uri' must not be null");
 		Matcher matcher = URI_PATTERN.matcher(uri);
 		if (matcher.matches()) {
 			UriComponentsBuilder builder = new UriComponentsBuilder();