Merge pull request #44309 from nosan
* pr/44309: Handle absolute files on Windows Closes gh-44309
This commit is contained in:
commit
af51660f40
|
@ -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();
|
||||
|
|
Loading…
Reference in New Issue