billbarker    2002/10/28 20:17:25

  Modified:    catalina/src/share/org/apache/catalina/startup
                        ContextConfig.java
  Log:
  The previous version was failing badly, at least with FileDirContext.
  
  I can't see that the new version could create any problems with any context, so Here 
goes.
  
  Revision  Changes    Path
  1.67      +5 -5      
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/ContextConfig.java
  
  Index: ContextConfig.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/ContextConfig.java,v
  retrieving revision 1.66
  retrieving revision 1.67
  diff -u -r1.66 -r1.67
  --- ContextConfig.java        23 Jun 2002 20:35:30 -0000      1.66
  +++ ContextConfig.java        29 Oct 2002 04:17:25 -0000      1.67
  @@ -1052,7 +1052,7 @@
               // FIXME - Servlet 2.3 DTD implies that the location MUST be
               // a context-relative path starting with '/'?
               if (!resourcePath.startsWith("/")) {
  -                resourcePath = "/WEB-INF/web.xml/../" + resourcePath;
  +                resourcePath = "/WEB-INF/" + resourcePath;
               }
               if (debug >= 3) {
                   log("   Adding path '" + resourcePath +
  
  
  

--
To unsubscribe, e-mail:   <mailto:tomcat-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:tomcat-dev-help@;jakarta.apache.org>

Reply via email to