tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lu...@apache.org
Subject cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core StandardWrapper.java
Date Wed, 07 Apr 2004 02:31:08 GMT
luehe       2004/04/06 19:31:08

  Modified:    catalina/src/share/org/apache/catalina/core
                        StandardWrapper.java
  Log:
  JspServlet (global or webapp-specific) must always be preloaded,
  because its instance is used during registerJMX (when registering the
  JSP monitoring mbean)
  
  Revision  Changes    Path
  1.41      +11 -3     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.40
  retrieving revision 1.41
  diff -u -r1.40 -r1.41
  --- StandardWrapper.java	20 Mar 2004 01:35:02 -0000	1.40
  +++ StandardWrapper.java	7 Apr 2004 02:31:08 -0000	1.41
  @@ -378,8 +378,16 @@
        */
       public int getLoadOnStartup() {
   
  -        return (this.loadOnStartup);
  -
  +        if (isJspServlet && loadOnStartup < 0) {
  +            /*
  +             * JspServlet must always be preloaded, because its instance is
  +             * used during registerJMX (when registering the JSP
  +             * monitoring mbean)
  +             */
  +             return Integer.MAX_VALUE;
  +        } else {
  +            return (this.loadOnStartup);
  +        }
       }
   
   
  
  
  

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


Mime
View raw message