Author: markt
Date: Sun May 8 22:53:32 2011
New Revision: 1100832
URL: http://svn.apache.org/viewvc?rev=1100832&view=rev
Log:
Use the correct classloader
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java?rev=1100832&r1=1100831&r2=1100832&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java Sun May 8
22:53:32 2011
@@ -1136,7 +1136,8 @@ public class StandardWrapper extends Con
if (getServlet() == null) {
Class<?> clazz = null;
try {
- clazz = getParentClassLoader().loadClass(getServletClass());
+ clazz = getParent().getLoader().getClassLoader().loadClass(
+ getServletClass());
processServletSecurityAnnotation(clazz);
} catch (ClassNotFoundException e) {
// Safe to ignore. No class means no annotations to process
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1100832&r1=1100831&r2=1100832&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Sun May 8 22:53:32 2011
@@ -61,6 +61,10 @@
Use safe equality test when determining event type in the
MapperListener. (markt)
</fix>
+ <fix>
+ Use correct class loader when loading Servlet classes in
+ StandardWrapper. (markt)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
