Merge branch '6.1.x'

2024-09-25 12:46:37 +02:00
parent 7051cddcf7 daa109e2ec
commit 885f650911
5 changed files with 35 additions and 15 deletions
--- a/spring-core/src/test/java/org/springframework/core/io/ResourceTests.java
+++ b/spring-core/src/test/java/org/springframework/core/io/ResourceTests.java
@@ -376,6 +376,13 @@ class ResourceTests {
 			assertThat(relative).isEqualTo(new UrlResource("file:dir/subdir"));
 		}

+		@Test
+		void unusualRelativeResourcesAreEqual() throws Exception {
+			Resource resource = new UrlResource("file:dir/");
+			Resource relative = resource.createRelative("http://spring.io");
+			assertThat(relative).isEqualTo(new UrlResource("file:dir/http://spring.io"));
+		}
+
 		@Test
 		void missingRemoteResourceDoesNotExist() throws Exception {
 			String baseUrl = startServer();