tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core StandardContext.java
Date Sun, 02 Dec 2001 22:24:49 GMT
remm        01/12/02 14:24:49

  Modified:    catalina/src/share/org/apache/catalina/core Tag:
                        tomcat_40_branch StandardContext.java
  Log:
  - Revert this patch (sorry Costin):
  - Port patch which makes the parent class loader of a privileged webapp be
    the Catalina loader, which gives it full access to the Catalina internals.
  - The problem is that Catalina wants to load-on-startup Jasper for all webapps,
    and Jasper is not available in the Catalina CL.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.78.2.9  +17 -11    jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java
  
  Index: StandardContext.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
  retrieving revision 1.78.2.8
  retrieving revision 1.78.2.9
  diff -u -r1.78.2.8 -r1.78.2.9
  --- StandardContext.java	2001/12/02 17:38:17	1.78.2.8
  +++ StandardContext.java	2001/12/02 22:24:49	1.78.2.9
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
1.78.2.8 2001/12/02 17:38:17 remm Exp $
  - * $Revision: 1.78.2.8 $
  - * $Date: 2001/12/02 17:38:17 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
1.78.2.9 2001/12/02 22:24:49 remm Exp $
  + * $Revision: 1.78.2.9 $
  + * $Date: 2001/12/02 22:24:49 $
    *
    * ====================================================================
    *
  @@ -142,7 +142,7 @@
    *
    * @author Craig R. McClanahan
    * @author Remy Maucherat
  - * @version $Revision: 1.78.2.8 $ $Date: 2001/12/02 17:38:17 $
  + * @version $Revision: 1.78.2.9 $ $Date: 2001/12/02 22:24:49 $
    */
   
   public class StandardContext
  @@ -3307,15 +3307,21 @@
               }
           }
           if (getLoader() == null) {      // (2) Required by Manager
  -            if (getPrivileged()) {
  -                if (debug >= 1)
  -                    log("Configuring privileged default Loader");
  -                setLoader(new WebappLoader(this.getClass().getClassLoader()));
  +            // FIXME: All webapps require Jasper, but Jasper isn't available in
  +            // the Catalina CL.
  +            /*
  +              if (getPrivileged()) {
  +              if (debug >= 1)
  +              log("Configuring privileged default Loader");
  +              setLoader(new WebappLoader(this.getClass().getClassLoader()));
               } else {
  -                if (debug >= 1)
  -                    log("Configuring non-privileged default Loader");
  -                setLoader(new WebappLoader(getParentClassLoader()));
  +            */
  +            if (debug >= 1)
  +                log("Configuring non-privileged default Loader");
  +            setLoader(new WebappLoader(getParentClassLoader()));
  +            /*
               }
  +            */
           }
           if (getManager() == null) {     // (3) After prerequisites
               if (debug >= 1)
  
  
  

--
To unsubscribe, e-mail:   <mailto:tomcat-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:tomcat-dev-help@jakarta.apache.org>


Mime
View raw message