svn commit: r782129 - /tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/renderer/VelocityAttributeRenderer.java

[ap...@apache.org]

Author: apetrelli
Date: Fri Jun  5 20:40:44 2009
New Revision: 782129

URL: http://svn.apache.org/viewvc?rev=782129&view=rev
Log:
TILES-414
Patch, submitted by Matt Benson, applied.

Modified:
    tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/renderer/VelocityAttributeRenderer.java

Modified: tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/renderer/VelocityAttributeRenderer.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/renderer/VelocityAttributeRenderer.java?rev=782129&r1=782128&r2=782129&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/renderer/VelocityAttributeRenderer.java (original)
+++ tiles/framework/trunk/tiles-velocity/src/main/java/org/apache/tiles/velocity/renderer/VelocityAttributeRenderer.java Fri Jun  5 20:40:44 2009
@@ -38,7 +38,7 @@
 import org.apache.tiles.servlet.context.ServletUtil;
 import org.apache.velocity.Template;
 import org.apache.velocity.context.Context;
-import org.apache.velocity.tools.view.AbstractJeeConfigImpl;
+import org.apache.velocity.tools.view.JeeConfig;
 import org.apache.velocity.tools.view.VelocityView;
 
 /**
@@ -123,7 +123,7 @@
      * @version $Rev$ $Date$
      * @since 2.2.0
      */
-    private class TilesApplicationContextJeeConfig extends AbstractJeeConfigImpl {
+    private class TilesApplicationContextJeeConfig implements JeeConfig {
 
         /** {@inheritDoc} */
         public String getInitParameter(String name) {
@@ -131,6 +131,19 @@
         }
 
         /** {@inheritDoc} */
+        public String findInitParameter(String key) {
+            String initParameter = getInitParameter(key);
+            if (initParameter != null) {
+                return initParameter;
+            }
+            ServletContext servletContext = getServletContext();
+            if (servletContext == null) {
+                return null;
+            }
+            return servletContext.getInitParameter(key);
+        }
+
+        /** {@inheritDoc} */
         @SuppressWarnings("unchecked")
         public Enumeration getInitParameterNames() {
             return new IteratorEnumeration(params.keySet().iterator());