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

[jon]

jon         00/11/07 15:13:55

  Modified:    src/java/org/apache/velocity/servlet VelocityServlet.java
  Log:
  make sure to put the writer back onto the stack
  
  Revision  Changes    Path
  1.15      +2 -3      
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.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- VelocityServlet.java      2000/11/04 04:58:42     1.14
  +++ VelocityServlet.java      2000/11/07 23:13:52     1.15
  @@ -98,7 +98,7 @@
    *
    * @author Dave Bryson
    * @author <a href="mailto:[EMAIL PROTECTED]">Jon S. Stevens</a>
  - * $Id: VelocityServlet.java,v 1.14 2000/11/04 04:58:42 jon Exp $
  + * $Id: VelocityServlet.java,v 1.15 2000/11/07 23:13:52 jon Exp $
    */
   public abstract class VelocityServlet extends HttpServlet
   {
  @@ -247,14 +247,12 @@
               }
               catch (Exception e)
               {
  -                // do nothing
               }
               if (vw == null)
                   vw = new JspWriterImpl(new OutputStreamWriter(output, encoding), 
4*1024, true);
               else
                   vw.recycle(new OutputStreamWriter(output, encoding));
               template.merge( context, vw);
  -            writerStack.push(vw);
   
               //Writer vw = new BufferedWriter(new OutputStreamWriter(output));
           }
  @@ -269,6 +267,7 @@
               {
                   if (vw != null)
                   {
  +                    writerStack.push(vw);
                       vw.flush();
                       output.close();
                   }