tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r793019 - /tomcat/trunk/java/org/apache/catalina/startup/TldConfig.java
Date Fri, 10 Jul 2009 16:26:56 GMT
Author: markt
Date: Fri Jul 10 16:26:56 2009
New Revision: 793019

URL: http://svn.apache.org/viewvc?rev=793019&view=rev
Log:
Revert r792945 - JSP.7.3.6.1 explicitly states locations without a leading '/' are to be treated
as relative to web.xml

Modified:
    tomcat/trunk/java/org/apache/catalina/startup/TldConfig.java

Modified: tomcat/trunk/java/org/apache/catalina/startup/TldConfig.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/TldConfig.java?rev=793019&r1=793018&r2=793019&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/TldConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/TldConfig.java Fri Jul 10 16:26:56 2009
@@ -508,6 +508,11 @@
         String taglibs[] = context.findTaglibs();
         for (int i = 0; i < taglibs.length; i++) {
             String resourcePath = context.findTaglib(taglibs[i]);
+            // FIXME - Servlet 2.4 DTD implies that the location MUST be
+            // a context-relative path starting with '/'?
+            if (!resourcePath.startsWith("/")) {
+                resourcePath = "/WEB-INF/" + resourcePath;
+            }
             if (log.isTraceEnabled()) {
                 log.trace("   Adding path '" + resourcePath +
                     "' for URI '" + taglibs[i] + "'");



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message