[prev in list] [next in list] [prev in thread] [next in thread] 

List:       velocity-dev
Subject:    cvs commit: jakarta-velocity/src/java/org/apache/velocity/runtime/directive VMProxyArg.java
From:       geirm () apache ! org
Date:       2002-03-28 15:35:33
[Download RAW message or body]

geirm       02/03/28 07:35:33

  Modified:    src/java/org/apache/velocity/runtime/directive Tag:
                        VEL_1_3_BRANCH VMProxyArg.java
  Log:
  backport of the fix for #foo("#bar('a')") throwing an NPE
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.11.2.1  +12 -4     jakarta-velocity/src/java/org/apache/velocity/runtime/directive/VMProxyArg.java
  
  Index: VMProxyArg.java
  ===================================================================
  RCS file: /home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/directive/VMProxyArg.java,v
  retrieving revision 1.11
  retrieving revision 1.11.2.1
  diff -u -r1.11 -r1.11.2.1
  --- VMProxyArg.java	28 Feb 2002 05:24:24 -0000	1.11
  +++ VMProxyArg.java	28 Mar 2002 15:35:33 -0000	1.11.2.1
  @@ -3,7 +3,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2002 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -60,7 +60,9 @@
   import java.io.BufferedReader;
   
   import org.apache.velocity.context.Context;
  +import org.apache.velocity.VelocityContext;
   import org.apache.velocity.context.InternalContextAdapter;
  +import org.apache.velocity.context.InternalContextAdapterImpl;
   import org.apache.velocity.runtime.RuntimeServices;
   import org.apache.velocity.runtime.parser.node.Node;
   import org.apache.velocity.runtime.parser.node.ASTReference;
  @@ -113,7 +115,7 @@
    *  into a local context.
    *  
    *  @author <a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a>
  - *  @version $Id: VMProxyArg.java,v 1.11 2002/02/28 05:24:24 geirm Exp $ 
  + *  @version $Id: VMProxyArg.java,v 1.11.2.1 2002/03/28 15:35:33 geirm Exp $ 
    */
   public class VMProxyArg
   {
  @@ -435,10 +437,16 @@
                       }
   
                       /*
  -                     *  init.  We can do this as they are only references
  +                     *  init.  be a good citizen and give it an ICA
                        */
   
  -                    nodeTree.init(null, rsvc);
  +                    InternalContextAdapter ica
  +                            = new InternalContextAdapterImpl(new VelocityContext());
  +
  +                    ica.pushCurrentTemplateName("VMProxyArg : "
  +                            + ParserTreeConstants.jjtNodeName[type]);
  +
  +                    nodeTree.init(ica, rsvc);
                   } 
                   catch ( Exception e ) 
                   {
  
  
  

--
To unsubscribe, e-mail:   <mailto:velocity-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:velocity-dev-help@jakarta.apache.org>

[prev in list] [next in list] [prev in thread] [next in thread]