You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by re...@apache.org on 2002/03/11 08:40:49 UTC

cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core StandardWrapper.java

remm        02/03/10 23:40:49

  Modified:    catalina/src/share/org/apache/catalina/core Tag:
                        tomcat_40_branch StandardWrapper.java
  Log:
  - Fix dual initialization of a servlet problem which was introduced in 4.0.4 b1.
    Bug reported by Kevin Burton.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.29.2.9  +4 -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.29.2.8
  retrieving revision 1.29.2.9
  diff -u -r1.29.2.8 -r1.29.2.9
  --- StandardWrapper.java	20 Feb 2002 07:09:48 -0000	1.29.2.8
  +++ StandardWrapper.java	11 Mar 2002 07:40:49 -0000	1.29.2.9
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardWrapper.java,v 1.29.2.8 2002/02/20 07:09:48 remm Exp $
  - * $Revision: 1.29.2.8 $
  - * $Date: 2002/02/20 07:09:48 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardWrapper.java,v 1.29.2.9 2002/03/11 07:40:49 remm Exp $
  + * $Revision: 1.29.2.9 $
  + * $Date: 2002/03/11 07:40:49 $
    *
    * ====================================================================
    *
  @@ -104,7 +104,7 @@
    *
    * @author Craig R. McClanahan
    * @author Remy Maucherat
  - * @version $Revision: 1.29.2.8 $ $Date: 2002/02/20 07:09:48 $
  + * @version $Revision: 1.29.2.9 $ $Date: 2002/03/11 07:40:49 $
    */
   
   public final class StandardWrapper
  @@ -915,7 +915,6 @@
           try {
               instanceSupport.fireInstanceEvent(InstanceEvent.BEFORE_INIT_EVENT,
                                                 servlet);
  -            servlet.init(facade);
               servlet.init(facade);
               // Invoke jspInit on JSP pages
               if ((loadOnStartup > 0) && (jspFile != null)) {
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>