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-7' into jetty-8

This commit is contained in:
Greg Wilkins 2013-04-05 09:58:33 +11:00
parent c7b671d49d b58066451e
commit 6b3cb20720
1 changed files with 2 additions and 3 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/Resource.java
View File

@ -217,8 +217,7 @@ public abstract class Resource implements ResourceFactory
{ {
URL url=null; URL url=null;
// Try to format as a URL? // Try to format as a URL?
ClassLoader ClassLoader loader=Thread.currentThread().getContextClassLoader();
loader=Thread.currentThread().getContextClassLoader();
if (loader!=null) if (loader!=null)
{ {
try try
@ -250,7 +249,7 @@ public abstract class Resource implements ResourceFactory
{ {
url=ClassLoader.getSystemResource(resource); url=ClassLoader.getSystemResource(resource);
if (url==null && resource.startsWith("/")) if (url==null && resource.startsWith("/"))
url=loader.getResource(resource.substring(1)); url=ClassLoader.getSystemResource(resource.substring(1));
} }
if (url==null) if (url==null)