svn commit: r688779 - /velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/VelocityView.java

[nbubna]

Author: nbubna
Date: Mon Aug 25 10:11:41 2008
New Revision: 688779

URL: http://svn.apache.org/viewvc?rev=688779&view=rev
Log:
tweak init(JeeConfig) to make it easier, more efficient to subclass

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

Modified: 
velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/VelocityView.java
URL: 
http://svn.apache.org/viewvc/velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/VelocityView.java?rev=688779&r1=688778&r2=688779&view=diff
==============================================================================
--- 
velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/VelocityView.java
 (original)
+++ 
velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/VelocityView.java
 Mon Aug 25 10:11:41 2008
@@ -214,7 +214,6 @@
     {
         setToolboxKey(toolboxKey);
 
-        this.servletContext = config.getServletContext();
         init(config);
     }
 
@@ -305,14 +304,19 @@
      */
     protected void init(JeeConfig config)
     {
+        this.servletContext = config.getServletContext();
+
         String depMode = findInitParameter(DEPRECATION_SUPPORT_MODE_KEY, 
config);
         if (depMode != null && depMode.equalsIgnoreCase("false"))
         {
             setDeprecationSupportMode(false);
         }
         
-        // initialize a new VelocityEngine
-        init(config, new VelocityEngine());
+        if (getVelocityEngine() == null)
+        {
+            // initialize a new VelocityEngine
+            init(config, new VelocityEngine());
+        }
 
         // initialize a new ToolboxFactory
         init(config, new ToolboxFactory());