tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From craig...@apache.org
Subject cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets InvokerServlet.java
Date Fri, 24 Aug 2001 23:19:06 GMT
craigmcc    01/08/24 16:19:06

  Modified:    catalina/src/share/org/apache/catalina/servlets
                        InvokerServlet.java
  Log:
  In the continuing saga of getting race conditions on invoked servlets
  fixed, add a check for a pre-existing Wrapper for the servlet by *name* as
  well as by *class*.  Much thanks to Eddie Ruvinsky for digging in to the
  code and helping figure out what's going on here.
  
  PR: Bugzilla #3188
  Submitted by:	Eddie Ruvinsky <ruvinsky@yahoo.com>
  
  Revision  Changes    Path
  1.13      +7 -5      jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/InvokerServlet.java
  
  Index: InvokerServlet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/InvokerServlet.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- InvokerServlet.java	2001/08/23 16:42:26	1.12
  +++ InvokerServlet.java	2001/08/24 23:19:06	1.13
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/InvokerServlet.java,v
1.12 2001/08/23 16:42:26 craigmcc Exp $
  - * $Revision: 1.12 $
  - * $Date: 2001/08/23 16:42:26 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/InvokerServlet.java,v
1.13 2001/08/24 23:19:06 craigmcc Exp $
  + * $Revision: 1.13 $
  + * $Date: 2001/08/24 23:19:06 $
    *
    * ====================================================================
    *
  @@ -87,7 +87,7 @@
    * in the web application deployment descriptor.
    *
    * @author Craig R. McClanahan
  - * @version $Revision: 1.12 $ $Date: 2001/08/23 16:42:26 $
  + * @version $Revision: 1.13 $ $Date: 2001/08/24 23:19:06 $
    */
   
   public final class InvokerServlet
  @@ -330,8 +330,10 @@
           // try to initialize the same servlet at the same time
           synchronized (this) {
   
  -            // Are we referencing an existing servlet name?
  +            // Are we referencing an existing servlet class or name?
               wrapper = (Wrapper) context.findChild(servletClass);
  +            if (wrapper == null)
  +                wrapper = (Wrapper) context.findChild(name);
               if (wrapper != null) {
                   if (debug >= 1)
                       log("Using wrapper for servlet '" +
  
  
  

Mime
View raw message