Merge branch '3.2.x'

See spring-projectsgh-40616
hyk001 · May 3, 2024 · 3b66eb7 · 3b66eb7
2 parents 259d7fd + 8a72e55
commit 3b66eb7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/...ng-boot-loader/src/main/java/org/springframework/boot/loader/nio/file/UriPathEncoder.java b/...ng-boot-loader/src/main/java/org/springframework/boot/loader/nio/file/UriPathEncoder.java
@@ -36,7 +36,7 @@ private UriPathEncoder() {
 	static String encode(String path) {
 		byte[] bytes = path.getBytes(StandardCharsets.UTF_8);
 		for (byte b : bytes) {
-			if (isAllowed(b)) {
+			if (!isAllowed(b)) {
 				return encode(bytes);
 			}
 		}

diff --git a/...ot-loader/src/test/java/org/springframework/boot/loader/nio/file/UriPathEncoderTests.java b/...ot-loader/src/test/java/org/springframework/boot/loader/nio/file/UriPathEncoderTests.java
@@ -34,4 +34,10 @@ void encodePath() {
 		assertThat(UriPathEncoder.encode("/Z\u00fcrich")).isEqualTo("/Z%C3%BCrich");
 	}
 
+	@Test
+	void encodePathWhenNoEncodingIsRequiredReturnsSameInstance() {
+		String path = "/foo/bar";
+		assertThat(UriPathEncoder.encode(path)).isSameAs(path);
+	}
+
 }