svn commit: r1145169 - /velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/ViewToolManager.java

[cbrisson]

Author: cbrisson
Date: Mon Jul 11 13:30:01 2011
New Revision: 1145169

URL: http://svn.apache.org/viewvc?rev=1145169&view=rev
Log:
really handle the appToolsPublished boolean flag

Modified:
    
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/ViewToolManager.java

Modified: 
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/ViewToolManager.java
URL: 
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/ViewToolManager.java?rev=1145169&r1=1145168&r2=1145169&view=diff
==============================================================================
--- 
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/ViewToolManager.java
 (original)
+++ 
velocity/tools/trunk/velocity-tools-view/src/main/java/org/apache/velocity/tools/view/ViewToolManager.java
 Mon Jul 11 13:30:01 2011
@@ -199,6 +199,15 @@ public class ViewToolManager extends Too
     }
 
     /**
+     * Publish {@link Scope#APPLICATION} Toolbox.
+     */
+    protected void publishApplicationTools()
+    {
+        servletContext.setAttribute(this.toolboxKey, getApplicationToolbox());
+        appToolsPublished = true;
+    }
+
+    /**
      * Removes any published {@link Scope#APPLICATION} Toolbox.
      */
     protected void unpublishApplicationTools()
@@ -338,7 +347,7 @@ public class ViewToolManager extends Too
         }
         if (!appToolsPublished && hasApplicationTools())
         {
-            servletContext.setAttribute(this.toolboxKey, 
getApplicationToolbox());
+            publishApplicationTools();
         }
     }