Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x

This commit is contained in:
Greg Wilkins 2016-07-06 16:47:58 +10:00
parent 2326c5f855 fc36e45795
commit c9e6141844
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
jetty-util/src/main/java/org/eclipse/jetty/util/resource/PathResource.java
View File

@ -33,6 +33,7 @@ import java.nio.file.Files;
import java.nio.file.InvalidPathException;
import java.nio.file.LinkOption;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.nio.file.StandardOpenOption;
import java.nio.file.attribute.FileTime;
import java.util.ArrayList;
@ -83,7 +84,7 @@ public class PathResource extends Resource
try
{
if (Files.isSymbolicLink(path))
return Files.readSymbolicLink(path);
return path.getParent().resolve(Files.readSymbolicLink(path));
if (Files.exists(path))
{
Path real = abs.toRealPath(FOLLOW_LINKS);
@ -229,7 +230,7 @@ public class PathResource extends Resource
Path path;
try
{
path = new File(uri).toPath();
path = Paths.get(uri);
}
catch (InvalidPathException e)
{