cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets DefaultServlet.java

[remm]

remm        01/09/12 09:19:25

  Modified:    catalina/src/share/org/apache/catalina/servlets
                        DefaultServlet.java
  Log:
  - Must use rebind when ovewriting,
    Bug reported by Holger Menzel <holger.menzel at gi-consulting.de>
  
  Revision  Changes    Path
  1.39      +9 -5      
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java
  
  Index: DefaultServlet.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- DefaultServlet.java       2001/08/27 11:50:41     1.38
  +++ DefaultServlet.java       2001/09/12 16:19:25     1.39
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java,v
 1.38 2001/08/27 11:50:41 remm Exp $
  - * $Revision: 1.38 $
  - * $Date: 2001/08/27 11:50:41 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java,v
 1.39 2001/09/12 16:19:25 remm Exp $
  + * $Revision: 1.39 $
  + * $Date: 2001/09/12 16:19:25 $
    *
    * ====================================================================
    *
  @@ -122,7 +122,7 @@
    *
    * @author Craig R. McClanahan
    * @author Remy Maucherat
  - * @version $Revision: 1.38 $ $Date: 2001/08/27 11:50:41 $
  + * @version $Revision: 1.39 $ $Date: 2001/09/12 16:19:25 $
    */
   
   public class DefaultServlet
  @@ -606,7 +606,11 @@
           try {
               Resource newResource = new Resource(req.getInputStream());
               // FIXME: Add attributes
  -            resources.bind(path, newResource);
  +            if (exists) {
  +                resources.rebind(path, newResource);
  +            } else {
  +                resources.bind(path, newResource);
  +            }
           } catch(NamingException e) {
               result = false;
           }