Skip to content

Handle absolute file path on Windows #44309

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Handle absolute file path on Windows #44309

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions ...ject/spring-boot/src/main/java/org/springframework/boot/io/ApplicationResourceLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,10 +216,7 @@ public Resource getResource(String location) {
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;
Expand Down Expand Up @@ -254,6 +251,10 @@ private static final class ApplicationResource extends FileSystemResource implem
super(path);
}

ApplicationResource(Path path) {
super(path);
}

@Override
public String getPathWithinContext() {
return getPath();
Expand Down
Loading