geirm 01/02/04 20:42:23
Modified: whiteboard/geir Velocity.java
Log:
Change b/c the internal context changed for template name tracking...
Revision Changes Path
1.3 +4 -3 jakarta-velocity/whiteboard/geir/Velocity.java
Index: Velocity.java
===================================================================
RCS file: /home/cvs/jakarta-velocity/whiteboard/geir/Velocity.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Velocity.java 2001/02/02 11:57:56 1.2
+++ Velocity.java 2001/02/05 04:42:23 1.3
@@ -65,7 +65,7 @@
* SLOW PROGRESS :)
*
* @author <a href="mailto:[EMAIL PROTECTED]">Geir Magnusson Jr.</a>
- * @version $Id: Velocity.java,v 1.2 2001/02/02 11:57:56 geirm Exp $
+ * @version $Id: Velocity.java,v 1.3 2001/02/05 04:42:23 geirm Exp $
*/
package org.apache.velocity.util;
@@ -180,9 +180,10 @@
if (nodeTree != null)
{
InternalContextAdapterImpl ica = new InternalContextAdapterImpl(
context );
- ica.setCurrentTemplateName( logTag );
+ ica.pushCurrentTemplateName( logTag );
nodeTree.init( ica, null );
nodeTree.render( ica, writer );
+ ica.popCurrentTemplateName();
return true;
}
}
@@ -275,9 +276,9 @@
{
InternalContextAdapterImpl ica = new InternalContextAdapterImpl(
context );
- ica.setCurrentTemplateName( namespace );
-
+ ica.pushCurrentTemplateName( namespace );
vp.render( ica, writer, null);
+ ica.popCurrentTemplateName();
}
catch (Exception e )
{
