You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tiles.apache.org by ap...@apache.org on 2009/10/23 19:48:52 UTC
svn commit: r829143 -
/tiles/framework/branches/TILES_2_1_X/tiles-core/src/main/java/org/apache/tiles/definition/dao/CachingLocaleUrlDefinitionDAO.java
Author: apetrelli
Date: Fri Oct 23 17:48:50 2009
New Revision: 829143
URL: http://svn.apache.org/viewvc?rev=829143&view=rev
Log:
TILES-482
Applied patch by Aris Tzoumas.
Modified:
tiles/framework/branches/TILES_2_1_X/tiles-core/src/main/java/org/apache/tiles/definition/dao/CachingLocaleUrlDefinitionDAO.java
Modified: tiles/framework/branches/TILES_2_1_X/tiles-core/src/main/java/org/apache/tiles/definition/dao/CachingLocaleUrlDefinitionDAO.java
URL: http://svn.apache.org/viewvc/tiles/framework/branches/TILES_2_1_X/tiles-core/src/main/java/org/apache/tiles/definition/dao/CachingLocaleUrlDefinitionDAO.java?rev=829143&r1=829142&r2=829143&view=diff
==============================================================================
--- tiles/framework/branches/TILES_2_1_X/tiles-core/src/main/java/org/apache/tiles/definition/dao/CachingLocaleUrlDefinitionDAO.java (original)
+++ tiles/framework/branches/TILES_2_1_X/tiles-core/src/main/java/org/apache/tiles/definition/dao/CachingLocaleUrlDefinitionDAO.java Fri Oct 23 17:48:50 2009
@@ -361,7 +361,15 @@
nudef.putAttribute(replace(attributeName, vars), nuattr);
}
}
-
+ Set<String> cascadedAttributeNames = d.getCascadedAttributeNames();
+ if (cascadedAttributeNames != null && !cascadedAttributeNames.isEmpty()) {
+ for (String attributeName : cascadedAttributeNames) {
+ Attribute attr = d.getCascadedAttribute(attributeName);
+ Attribute nuattr = replaceVarsInAttribute(attr, vars);
+
+ nudef.putAttribute(replace(attributeName, vars), nuattr, true);
+ }
+ }
return nudef;
}