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/webapps/docs changelog.xml
Date Wed, 06 Oct 2004 00:54:47 GMT
luehe       2004/10/05 17:54:47

  Modified:    catalina/src/share/org/apache/catalina/core
                        StandardWrapper.java
               webapps/docs changelog.xml
  Log:
  Undid previous change, as in the case where a servlet has a jsp-file
  and also declares some init params, as in:
  
    <servlet>
      <servlet-name>xxx</servlet-name>
      <jsp-file>/xxx.jsp</jsp-file>
      <init-param>
        <param-name>name1</param-name>
        <param-value>value1</param-value>
      </init-param>
    </servlet>
  
  it needs its *own* JspServlet instance that it can initialize with its
  own params. Sharing of JspServlet instance is not possible in this case.
  
  Will have to come up with a better solution against loss of monitoring
  info (the JspServlet that handles the above jsp-file currently is not
  registered with JMX).
  
  Revision  Changes    Path
  1.49      +1 -1      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.48
  retrieving revision 1.49
  diff -u -r1.48 -r1.49
  --- StandardWrapper.java	4 Oct 2004 16:40:57 -0000	1.48
  +++ StandardWrapper.java	6 Oct 2004 00:54:46 -0000	1.49
  @@ -867,6 +867,7 @@
                   Wrapper jspWrapper = (Wrapper)
                       ((Context) getParent()).findChild(Constants.JSP_SERVLET_NAME);
                   if (jspWrapper != null) {
  +                    actualClass = jspWrapper.getServletClass();
                       // Merge init parameters
                       String paramNames[] = jspWrapper.findInitParameters();
                       for (int i = 0; i < paramNames.length; i++) {
  @@ -876,7 +877,6 @@
                                    jspWrapper.findInitParameter(paramNames[i]));
                           }
                       }
  -                    return jspWrapper.allocate();
                   }
               }
   
  
  
  
  1.139     +0 -3      jakarta-tomcat-catalina/webapps/docs/changelog.xml
  
  Index: changelog.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
  retrieving revision 1.138
  retrieving revision 1.139
  diff -u -r1.138 -r1.139
  --- changelog.xml	5 Oct 2004 18:53:47 -0000	1.138
  +++ changelog.xml	6 Oct 2004 00:54:46 -0000	1.139
  @@ -140,9 +140,6 @@
         <fix>
           <bug>31549</bug>: Add name to WebappClassLoader's stopped message.
(yoavs)
         </fix>
  -      <fix>
  -        Share the same JspServlet instance between all JSPs that are referenced as jsp-file
elements inside servlet declarations in web.xml and all other JSPs. This also fixes loss of
JSP monitoring info. (luehe)
  -      </fix>
       </changelog>
     </subsection>
   
  
  
  

---------------------------------------------------------------------
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