Skip to content
Closed
Changes from all commits
Commits
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
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