svn commit: r563999 - /velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/ToolInfo.java

[nbubna]

Author: nbubna
Date: Wed Aug  8 12:24:12 2007
New Revision: 563999

URL: http://svn.apache.org/viewvc?view=rev&rev=563999
Log:
make sure access to properties field always runs thru getProps()

Modified:
    
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/ToolInfo.java

Modified: 
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/ToolInfo.java
URL: 
http://svn.apache.org/viewvc/velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/ToolInfo.java?view=diff&rev=563999&r1=563998&r2=563999
==============================================================================
--- 
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/ToolInfo.java
 (original)
+++ 
velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/ToolInfo.java
 Wed Aug  8 12:24:12 2007
@@ -175,7 +175,7 @@
 
     public Map<String,Object> getProperties()
     {
-        return properties;
+        return getProps();
     }
 
     public boolean hasConfigure()
@@ -226,7 +226,7 @@
            dynamic properties will almost always be conventions
            and we need to let configuration win out */
         Map<String,Object> combinedProps =
-            combine(dynamicProperties, this.properties);
+            combine(dynamicProperties, getProps());
 
         // perform the actual configuration of the new tool
         configure(tool, combinedProps);