From 183b9e692090688f2a9d03f0c624f4225554d988 Mon Sep 17 00:00:00 2001 From: Dmytro Nosan Date: Mon, 17 Feb 2025 18:12:01 +0200 Subject: [PATCH] Handle absolute files on Windows See gh-44309 Signed-off-by: Dmytro Nosan --- .../boot/io/ApplicationResourceLoader.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/io/ApplicationResourceLoader.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/io/ApplicationResourceLoader.java index cd5af8f959..b509744de5 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/io/ApplicationResourceLoader.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/io/ApplicationResourceLoader.java @@ -216,10 +216,7 @@ public class ApplicationResourceLoader extends DefaultResourceLoader { private Resource resolveFile(Resource resource) { try { File file = resource.getFile(); - if (file.isAbsolute()) { - return resource; - } - return new ApplicationResource(new File(this.workingDirectory.toFile(), file.getPath()).getPath()); + return new ApplicationResource(this.workingDirectory.resolve(file.toPath())); } catch (FileNotFoundException ex) { return resource; @@ -254,6 +251,10 @@ public class ApplicationResourceLoader extends DefaultResourceLoader { super(path); } + ApplicationResource(Path path) { + super(path); + } + @Override public String getPathWithinContext() { return getPath();