Correction for commit #b219c6c

Issue: SPR-17630

Author: rstoyanchev

spring-web/src/main/java/org/springframework/web/util/UriComponentsBuilder.java

@@ -458,7 +458,7 @@ public URI build(Map<String, ?> uriVariables) {
 	 */
 	public String toUriString() {
 		return this.uriVariables.isEmpty() ?
-				encode().build().toUriString() :
+				build().encode().toUriString() :
 				buildInternal(EncodingHint.ENCODE_TEMPLATE).toUriString();
 	}
 

spring-web/src/test/java/org/springframework/web/util/UriComponentsBuilderTests.java

@@ -934,4 +934,9 @@ public void uriComponentsWithMergedQueryParams() {
 		assertEquals("http://localhost:8081/{path}?sort={sort}&sort=another_value", uri);
 	}
 
+	@Test // SPR-17630
+	public void toUriStringWithCurlyBraces() {
+		assertEquals("/path?q=%7Basa%7Dasa",
+				UriComponentsBuilder.fromUriString("/path?q={asa}asa").toUriString());
+	}
 }