cvs commit: jakarta-velocity/src/java/org/apache/velocity/runtime Runtime.java

[jvanzyl]

jvanzyl     01/03/04 13:10:27

  Modified:    src/java/org/apache/velocity/runtime Runtime.java
  Log:
  - making sure that properties to be overriden are actually
    replaced and not globbed together in a vector.
  
  Revision  Changes    Path
  1.90      +2 -2      
jakarta-velocity/src/java/org/apache/velocity/runtime/Runtime.java
  
  Index: Runtime.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/Runtime.java,v
  retrieving revision 1.89
  retrieving revision 1.90
  diff -u -r1.89 -r1.90
  --- Runtime.java      2001/03/03 20:33:20     1.89
  +++ Runtime.java      2001/03/04 21:10:26     1.90
  @@ -172,7 +172,7 @@
    * @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
    * @author <a href="mailto:[EMAIL PROTECTED]">Jeff Bowden</a>
    * @author <a href="mailto:[EMAIL PROTECTED]">Geir Magusson Jr.</a>
  - * @version $Id: Runtime.java,v 1.89 2001/03/03 20:33:20 jvanzyl Exp $
  + * @version $Id: Runtime.java,v 1.90 2001/03/04 21:10:26 jvanzyl Exp $
    */
   public class Runtime implements RuntimeConstants
   {    
  @@ -465,7 +465,7 @@
               for (Enumeration e = overridingProperties.keys(); e.hasMoreElements() ; 
) 
               {
                   String s = (String) e.nextElement();
  -                configuration.setProperty( s, overridingProperties.getProperty(s) );
  +                configuration.setOverridingProperty( s, 
overridingProperties.getProperty(s) );
                   info ("   ** Property Override : " + s + " = " + 
                       overridingProperties.getProperty(s));
               }