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

This commit is contained in:
Greg Wilkins 2013-08-23 17:17:57 +10:00
parent d2ff475834 2a178a29fd
commit c3691b60b0
1 changed files with 0 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
View File

@ -1589,25 +1589,6 @@ public class ContextHandler extends ScopedHandler implements Attributes, Gracefu
{ {
path = URIUtil.canonicalPath(path); path = URIUtil.canonicalPath(path);
Resource resource = _baseResource.addPath(path); Resource resource = _baseResource.addPath(path);
System.err.println();
System.err.println("resource="+resource);
try
{
System.err.println("path="+path);
System.err.println("resource="+resource);
System.err.println("resource.getURI()="+resource.getURI());
System.err.println("resource.getURL()="+resource.getURL());
System.err.println("resource.getAlias()="+resource.getAlias());
System.err.println("resource.getFile() ="+resource.getFile());
System.err.println("resource.getFile().getCanonicalPath()="+resource.getFile().getCanonicalPath());
System.err.println("resource.getFile().getAbsolutePath() ="+resource.getFile().getAbsolutePath());
System.err.println("resource.exists() ="+resource.exists());
}
catch(Exception e)
{
e.printStackTrace();
}
// Is the resource aliased? // Is the resource aliased?
if (resource.getAlias() != null) if (resource.getAlias() != null)
@ -1615,21 +1596,17 @@ public class ContextHandler extends ScopedHandler implements Attributes, Gracefu
if (LOG.isDebugEnabled()) if (LOG.isDebugEnabled())
LOG.debug("Aliased resource: " + resource + "~=" + resource.getAlias()); LOG.debug("Aliased resource: " + resource + "~=" + resource.getAlias());
System.err.println("ALIAS="+resource.getAlias());
// alias checks // alias checks
for (Iterator<AliasCheck> i=_aliasChecks.iterator();i.hasNext();) for (Iterator<AliasCheck> i=_aliasChecks.iterator();i.hasNext();)
{ {
AliasCheck check = i.next(); AliasCheck check = i.next();
System.err.println("check="+check);
if (check.check(path,resource)) if (check.check(path,resource))
{ {
System.err.println("OK???");
if (LOG.isDebugEnabled()) if (LOG.isDebugEnabled())
LOG.debug("Aliased resource: " + resource + " approved by " + check); LOG.debug("Aliased resource: " + resource + " approved by " + check);
return resource; return resource;
} }
} }
System.err.println("NULL ALIAS");
return null; return null;
} }