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/master' into jetty-9.1

This commit is contained in:
Greg Wilkins 2013-09-27 13:37:55 +10:00
parent 1ccba6e172 458e511ce2
commit 080781ec0e
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,6 +32,8 @@ import java.nio.channels.ReadableByteChannel;
import java.nio.file.StandardOpenOption; import java.nio.file.StandardOpenOption;
import java.security.Permission; import java.security.Permission;
import javax.management.RuntimeErrorException;
import org.eclipse.jetty.util.IO; import org.eclipse.jetty.util.IO;
import org.eclipse.jetty.util.URIUtil; import org.eclipse.jetty.util.URIUtil;
import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Log;
@ -148,9 +150,19 @@ public class FileResource extends Resource
} }
catch(IOException e) catch(IOException e)
{ {
LOG.warn(e); LOG.warn("bad alias for {}: {}",file,e.toString());
LOG.debug(e);
try
{
return new URL("http://eclipse.org/bad/canonical/alias");
}
catch(Exception e2)
{
LOG.ignore(e2);
throw new RuntimeException(e);
}
} }
return null; return null;
} }