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

fixed merge

This commit is contained in:
Greg Wilkins 2013-10-14 18:00:53 +11:00
parent 1d5730d8d2
commit 8eb683f9b5
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
jetty-util/src/main/java/org/eclipse/jetty/util/resource/FileResource.java
View File

@ -111,16 +111,7 @@ public class FileResource extends Resource
_uri=normalizeURI(_file,uri);
if (!_uri.equals(_file.toURI()) && !_uri.toString().equals(_file.toURI().toString()))
{
try
{
_alias=_file.toURI().toURL();
}
catch (MalformedURLException e)
{
throw new IllegalArgumentException(e);
}
}
_alias=_file.toURI();
else
_alias=checkAlias(_file);
}