Author: markt
Date: Fri Jul 12 08:36:14 2013
New Revision: 1502471
URL: http://svn.apache.org/r1502471
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55244
Fix ClassNotFoundException with JspC
Patch provided by Jeremy Boynes
Modified:
tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebXmlParser.java
Modified: tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java?rev=1502471&r1=1502470&r2=1502471&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java Fri Jul
12 08:36:14 2013
@@ -125,6 +125,8 @@ public class JspCServletContext implemen
this.webXml = new WebXml();
WebXmlParser webXmlParser = new WebXmlParser(false, false);
+ // Use this class's classloader as Ant will have set the TCCL to its
own
+ webXmlParser.setClassLoader(getClass().getClassLoader());
InputStream webXmlStream = getResourceAsStream(
org.apache.tomcat.util.descriptor.web.Constants.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebXmlParser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebXmlParser.java?rev=1502471&r1=1502470&r2=1502471&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebXmlParser.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebXmlParser.java
Fri Jul 12 08:36:14 2013
@@ -130,4 +130,14 @@ public class WebXmlParser {
return ok;
}
+
+
+ /**
+ * Sets the ClassLoader to be used for creating descriptor objects.
+ * @param classLoader the ClassLoader to be used for creating descriptor
objects
+ */
+ public void setClassLoader(ClassLoader classLoader) {
+ webDigester.setClassLoader(classLoader);
+ webFragmentDigester.setClassLoader(classLoader);
+ }
}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
