From: Greg W. <gre...@us...> - 2005-10-30 12:05:07
|
User: gregwilkins Date: 05/10/30 04:04:56 Modified: modules/jetty/src/org/mortbay/jetty/handler ContextHandler.java Log: jsp Revision Changes Path 1.8 +15 -11 JettyExperimental/modules/jetty/src/org/mortbay/jetty/handler/ContextHandler.java Index: ContextHandler.java =================================================================== RCS file: /cvsroot/jetty/JettyExperimental/modules/jetty/src/org/mortbay/jetty/handler/ContextHandler.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -w -r1.7 -r1.8 --- ContextHandler.java 30 Oct 2005 11:07:33 -0000 1.7 +++ ContextHandler.java 30 Oct 2005 12:04:56 -0000 1.8 @@ -971,13 +971,14 @@ try { Resource resource=_baseResource.addPath(URIUtil.canonicalPath(path)); + if (resource.exists()) return resource.getURL(); } catch(Exception e) { LogSupport.ignore(log,e); - return null; } + return null; } /* ------------------------------------------------------------ */ @@ -1015,15 +1016,18 @@ try { Resource resource=_baseResource.addPath(URIUtil.canonicalPath(path)); + if (resource.exists()) + { String[] l=resource.list(); if (l!=null) { HashSet set = new HashSet(); for(int i=0;i<l.length;i++) - set.add(l[i]); + set.add(path+"/"+l[i]); return set; } } + } catch(Exception e) { LogSupport.ignore(log,e); |