cvs commit: jakarta-velocity/src/java/org/apache/velocity/servlet VelocityServlet.java

[geirm]

geirm       01/05/11 04:44:19

  Modified:    src/java/org/apache/velocity/servlet VelocityServlet.java
  Log:
  *Huge* mistake on my part.  Of course we have to flush VelocityWriter.
  A thousand pardons if this screwed anyone up.
  
  My penance will be to add a cactus test case to the testbed.
  
  Revision  Changes    Path
  1.34      +5 -4      
jakarta-velocity/src/java/org/apache/velocity/servlet/VelocityServlet.java
  
  Index: VelocityServlet.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/servlet/VelocityServlet.java,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- VelocityServlet.java      2001/05/10 01:12:10     1.33
  +++ VelocityServlet.java      2001/05/11 11:44:16     1.34
  @@ -129,7 +129,7 @@
    * @author <a href="mailto:[EMAIL PROTECTED]";>Jon S. Stevens</a>
    * @author <a href="mailto:[EMAIL PROTECTED]";>Geir Magnusson Jr.</a>
    * @author <a href="[EMAIL PROTECTED]">Kent Johnson</a>
  - * $Id: VelocityServlet.java,v 1.33 2001/05/10 01:12:10 geirm Exp $
  + * $Id: VelocityServlet.java,v 1.34 2001/05/11 11:44:16 geirm Exp $
    */
   public abstract class VelocityServlet extends HttpServlet
   {
  @@ -415,11 +415,12 @@
                   if (vw != null)
                   {
                       /*
  -                     * we just put the VelWriter back into the 
  -                     * pool.  We don't even have to flush.
  -                     * and we certainly shouldn't close it
  +                     *  flush and put back into the pool
  +                     *  don't close to allow us to play
  +                     *  nicely with others.
                        */
   
  +                    vw.flush();
                       writerPool.put(vw);
                   }                
               }