cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From robbypelss...@apache.org
Subject svn commit: r1409275 - /cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/node/AbstractSitemapNode.java
Date Wed, 14 Nov 2012 17:50:17 GMT
Author: robbypelssers
Date: Wed Nov 14 17:50:16 2012
New Revision: 1409275

URL: http://svn.apache.org/viewvc?rev=1409275&view=rev
Log:
[COCOON3-111] SiteMap node parameters are not evaluated against a LanguageInterpreter.  This
issue is now fixed.  We default resolve all invocationParameters now.

Modified:
    cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/node/AbstractSitemapNode.java

Modified: cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/node/AbstractSitemapNode.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/node/AbstractSitemapNode.java?rev=1409275&r1=1409274&r2=1409275&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/node/AbstractSitemapNode.java
(original)
+++ cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/node/AbstractSitemapNode.java
Wed Nov 14 17:50:16 2012
@@ -218,6 +218,13 @@ public abstract class AbstractSitemapNod
         
         final Map<String, Object> invocationParams = 
                 new HashMap<String, Object>(this.getParameters());
+
+        for (String key: invocationParams.keySet())   {
+            //overwrite the key with substituted value
+            invocationParams.put(key, invocation.resolveParameter(invocationParams.get(key).toString()));
+        }
+
+
         if (src != null) {
             final Object resolvedSource = invocation.resolveParameter(src);
             if (!(resolvedSource instanceof String)) {



Mime
View raw message