glenn       01/02/18 17:13:59

  Modified:    catalina/src/share/org/apache/catalina/core
                        StandardWrapper.java
  Log:
  Patch for Java SecurityManager to work with Craig's new Jasper class loading
  
  Revision  Changes    Path
  1.14      +13 -5     
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardWrapper.java
  
  Index: StandardWrapper.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardWrapper.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- StandardWrapper.java      2001/02/18 02:18:13     1.13
  +++ StandardWrapper.java      2001/02/19 01:13:57     1.14
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardWrapper.java,v
 1.13 2001/02/18 02:18:13 craigmcc Exp $
  - * $Revision: 1.13 $
  - * $Date: 2001/02/18 02:18:13 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardWrapper.java,v
 1.14 2001/02/19 01:13:57 glenn Exp $
  + * $Revision: 1.14 $
  + * $Date: 2001/02/19 01:13:57 $
    *
    * ====================================================================
    *
  @@ -104,7 +104,7 @@
    * make them efficient are counter-productive.
    *
    * @author Craig R. McClanahan
  - * @version $Revision: 1.13 $ $Date: 2001/02/18 02:18:13 $
  + * @version $Revision: 1.14 $ $Date: 2001/02/19 01:13:57 $
    */
   
   public final class StandardWrapper
  @@ -726,8 +726,16 @@
   
           // Special case class loader for the Jasper JSP servlet
           if (this.name.equals(Constants.JSP_SERVLET_NAME)) {
  -            if (jasperLoader == null)
  +            if (jasperLoader == null) {
                   jasperLoader = createJasperLoader(classLoader);
  +             // Preload below class to prevent defineClassInPackage
  +             // SecurityManager AccessControlException
  +             try {
  +                    jasperLoader.loadClass(
  +                        "org.apache.jasper.runtime.ServletResponseWrapperInclude");
  +             } catch(ClassNotFoundException e) {
  +             }
  +         }
               classLoader = jasperLoader;
           }
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]

Reply via email to