geirm       02/02/27 21:06:08

  Modified:    src/java/org/apache/velocity/runtime/parser/node
                        ASTStringLiteral.java
  Log:
  Fix for Paulo's inline-scope + recursive VM bug
  
  Revision  Changes    Path
  1.16      +4 -3      
jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTStringLiteral.java
  
  Index: ASTStringLiteral.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTStringLiteral.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- ASTStringLiteral.java     23 Feb 2002 10:52:23 -0000      1.15
  +++ ASTStringLiteral.java     28 Feb 2002 05:06:08 -0000      1.16
  @@ -69,7 +69,7 @@
    *
    * @author <a href="mailto:[EMAIL PROTECTED]";>Geir Magnusson Jr.</a>
    * @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
  - * @version $Id: ASTStringLiteral.java,v 1.15 2002/02/23 10:52:23 geirm Exp $
  + * @version $Id: ASTStringLiteral.java,v 1.16 2002/02/28 05:06:08 geirm Exp $
    */
   public class ASTStringLiteral extends SimpleNode
   {
  @@ -136,16 +136,17 @@
               /*
                *  now parse and init the nodeTree
                */
  -
               BufferedReader br = new BufferedReader(new 
StringReader(interpolateimage));
   
               /*
                * it's possible to not have an initialization context - or we don't
                * want to trust the caller - so have a fallback value if so
  +             *
  +             *  Also, do *not* dump the VM namespace for this template
                */
   
               nodeTree  = rsvc.parse(br, (context != null) ?
  -                    context.getCurrentTemplateName() : "StringLiteral");
  +                    context.getCurrentTemplateName() : "StringLiteral", false);
   
               /*
                *  init with context. It won't modify anything
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to