cvs commit: jakarta-velocity/whiteboard/geir Velocity.java

[geirm]

geirm       01/02/05 02:14:34

  Modified:    whiteboard/geir Velocity.java
  Log:
  pops in finallys!
  
  Revision  Changes    Path
  1.4       +21 -6     jakarta-velocity/whiteboard/geir/Velocity.java
  
  Index: Velocity.java
  ===================================================================
  RCS file: /home/cvs/jakarta-velocity/whiteboard/geir/Velocity.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Velocity.java     2001/02/05 04:42:23     1.3
  +++ Velocity.java     2001/02/05 10:14:33     1.4
  @@ -65,7 +65,7 @@
    * SLOW PROGRESS :)
    *
    * @author <a href="mailto:[EMAIL PROTECTED]">Geir Magnusson Jr.</a>
  - * @version $Id: Velocity.java,v 1.3 2001/02/05 04:42:23 geirm Exp $
  + * @version $Id: Velocity.java,v 1.4 2001/02/05 10:14:33 geirm Exp $
    */
   
   package org.apache.velocity.util;
  @@ -182,8 +182,16 @@
                   InternalContextAdapterImpl ica = new InternalContextAdapterImpl( 
context );
                   ica.pushCurrentTemplateName( logTag );
                   nodeTree.init( ica, null );
  -                nodeTree.render( ica, writer );
  -                ica.popCurrentTemplateName();
  +                
  +                try
  +                {
  +                    nodeTree.render( ica, writer );
  +                }
  +                finally
  +                {
  +                    ica.popCurrentTemplateName();
  +                }
  +                       
                   return true;
               }
           }
  @@ -191,7 +199,7 @@
           {
               Runtime.error("Velocity.evaluate() : tag = " + logTag + " : " + e );
           }
  -
  +        
           return false;
       }
   
  @@ -276,15 +284,22 @@
           {
               InternalContextAdapterImpl ica = new InternalContextAdapterImpl( 
context );
               
  -            ica.pushCurrentTemplateName( namespace );
  -            vp.render( ica, writer, null);
  -            ica.popCurrentTemplateName();
  +            try
  +            {
  +                ica.pushCurrentTemplateName( namespace );
  +                vp.render( ica, writer, null);
  +            }
  +            finally
  +            {
  +                ica.popCurrentTemplateName();
  +            }
           }
           catch (Exception e )
           {
               Runtime.error("Velocity.invokeVelocimacro() : " + e );
               return false;
           }
  +        
   
           return true;
       }