costin 2003/03/25 11:07:56 Modified: catalina/src/share/org/apache/catalina/core StandardWrapper.java Log: Fix for allowing manager servlet jars to be in WEB-INF/lib of jar. IF the app is priviledged, it'll have the loader as a child of the container - so we don't need the workaround. This would work for the other catalina servlets ( cgi, webdav, etc ) - all could move from catalina to their own webapps, where people can install them at will :-) Revision Changes Path 1.20 +10 -5 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardWrapper.java Index: StandardWrapper.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardWrapper.java,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- StandardWrapper.java 20 Mar 2003 18:28:28 -0000 1.19 +++ StandardWrapper.java 25 Mar 2003 19:07:56 -0000 1.20 @@ -923,7 +923,12 @@ ClassLoader classLoader = loader.getClassLoader(); // Special case class loader for a container provided servlet - if (isContainerProvidedServlet(actualClass)) { + // + if (isContainerProvidedServlet(actualClass) && + ! ((Context)getParent()).getPrivileged() ) { + // If it is a priviledged context - using its own + // class loader will work, since it's a child of the container + // loader classLoader = this.getClass().getClassLoader(); }
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]