svn commit: r679537 - in /velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/servlet: VelocityLayoutServlet.java VelocityViewServlet.java

[nbubna]

Author: nbubna
Date: Thu Jul 24 13:43:11 2008
New Revision: 679537

URL: http://svn.apache.org/viewvc?rev=679537&view=rev
Log:
for backwards compatibility, ensure that old VVS and VLS instances do not share 
VelocityView instances

Modified:
    
velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/servlet/VelocityLayoutServlet.java
    
velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/servlet/VelocityViewServlet.java

Modified: 
velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/servlet/VelocityLayoutServlet.java
URL: 
http://svn.apache.org/viewvc/velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/servlet/VelocityLayoutServlet.java?rev=679537&r1=679536&r2=679537&view=diff
==============================================================================
--- 
velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/servlet/VelocityLayoutServlet.java
 (original)
+++ 
velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/servlet/VelocityLayoutServlet.java
 Thu Jul 24 13:43:11 2008
@@ -21,6 +21,7 @@
 
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
+import org.apache.velocity.tools.view.VelocityView;
 
 /**
  * @author Nathan Bubna
@@ -31,6 +32,8 @@
 public class VelocityLayoutServlet
     extends org.apache.velocity.tools.view.VelocityLayoutServlet
 {
+    private transient VelocityView view;
+
     @Override
     public void init(ServletConfig config) throws ServletException
     {
@@ -40,4 +43,18 @@
                        " has been deprecated. Use " +
                        super.getClass().getName() + " instead.");
     }
+
+    /**
+     * Overrides parent to ensure each VVS instance has
+     * it's own separate configuration, just like in Tools 1.x.
+     */
+    @Override
+    protected VelocityView getVelocityView()
+    {
+        if (this.view == null)
+        {
+            this.view = new VelocityView(getServletConfig());
+        }
+        return this.view;
+    }
 }

Modified: 
velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/servlet/VelocityViewServlet.java
URL: 
http://svn.apache.org/viewvc/velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/servlet/VelocityViewServlet.java?rev=679537&r1=679536&r2=679537&view=diff
==============================================================================
--- 
velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/servlet/VelocityViewServlet.java
 (original)
+++ 
velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/servlet/VelocityViewServlet.java
 Thu Jul 24 13:43:11 2008
@@ -43,6 +43,8 @@
     protected static final String DEFAULT_TOOLBOX_PATH =
         VelocityView.DEPRECATED_USER_TOOLS_PATH;
 
+    private transient VelocityView view;
+
     @Override
     public void init(ServletConfig config) throws ServletException
     {
@@ -52,4 +54,18 @@
                        " has been deprecated. Use " +
                        super.getClass().getName() + " instead.");
     }
+
+    /**
+     * Overrides parent to ensure each VVS instance has
+     * it's own separate configuration, just like in Tools 1.x.
+     */
+    @Override
+    protected VelocityView getVelocityView()
+    {
+        if (this.view == null)
+        {
+            this.view = new VelocityView(getServletConfig());
+        }
+        return this.view;
+    }
 }