You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@velocity.apache.org by nb...@apache.org on 2007/05/12 18:40:14 UTC

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

Author: nbubna
Date: Sat May 12 09:40:13 2007
New Revision: 537479

URL: http://svn.apache.org/viewvc?view=rev&rev=537479
Log:
copy cache when combining toolboxes

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

Modified: velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/Toolbox.java
URL: http://svn.apache.org/viewvc/velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/Toolbox.java?view=diff&rev=537479&r1=537478&r2=537479
==============================================================================
--- velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/Toolbox.java (original)
+++ velocity/tools/branches/2.x/src/main/java/org/apache/velocity/tools/Toolbox.java Sat May 12 09:40:13 2007
@@ -170,6 +170,7 @@
         Map<String,Object> props = new HashMap<String,Object>(properties);
         for (Toolbox toolbox : toolboxes)
         {
+            cache.putAll(toolbox.cache);
             info.putAll(toolbox.infoMap);
             props.putAll(toolbox.properties);
         }