You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2014/01/16 20:40:09 UTC
svn commit: r1558894 - in /tomcat/tc7.0.x/trunk:
java/org/apache/tomcat/util/descriptor/DigesterFactory.java
webapps/docs/changelog.xml
Author: markt
Date: Thu Jan 16 19:40:09 2014
New Revision: 1558894
URL: http://svn.apache.org/r1558894
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56016
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/descriptor/DigesterFactory.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/descriptor/DigesterFactory.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/descriptor/DigesterFactory.java?rev=1558894&r1=1558893&r2=1558894&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/descriptor/DigesterFactory.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/descriptor/DigesterFactory.java Thu Jan 16 19:40:09 2014
@@ -22,6 +22,7 @@ import java.util.HashMap;
import java.util.Map;
import javax.servlet.ServletContext;
+import javax.servlet.jsp.JspContext;
import org.apache.tomcat.util.digester.Digester;
import org.apache.tomcat.util.digester.RuleSet;
@@ -102,7 +103,7 @@ public class DigesterFactory {
private static String idFor(String url) {
URL id = ServletContext.class.getResource("resources/" + url);
if (id == null) {
- id = ServletContext.class.getResource("jsp/resources/" + url);
+ id = JspContext.class.getResource("jsp/resources/" + url);
}
return id.toExternalForm();
}
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1558894&r1=1558893&r2=1558894&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Jan 16 19:40:09 2014
@@ -82,6 +82,12 @@
<bug>55974</bug>: Retain order when reporting errors and warnings while
parsing XML configuration files. (markt)
</fix>
+ <fix>
+ <bug>56016</bug>: When loading resources for XML schema validation, take
+ account of the possibility that servlet-api.jar and jsp-api.jar may not
+ be loaded by the same class loader. Patch by Juan Carlos Estibariz.
+ (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org