You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@tiles.apache.org by nl...@apache.org on 2012/04/28 03:22:31 UTC

svn commit: r1331650 - /tiles/framework/trunk/tiles-parent/tiles-core/src/main/java/org/apache/tiles/definition/dao/CachingLocaleUrlDefinitionDAO.java

Author: nlebas
Date: Sat Apr 28 01:22:30 2012
New Revision: 1331650

URL: http://svn.apache.org/viewvc?rev=1331650&view=rev
Log:
TILES-547 #resolve disabled the use of cache for loading raw definitions (the cache contains only non-wildcard or resolved definitions)

Modified:
    tiles/framework/trunk/tiles-parent/tiles-core/src/main/java/org/apache/tiles/definition/dao/CachingLocaleUrlDefinitionDAO.java

Modified: tiles/framework/trunk/tiles-parent/tiles-core/src/main/java/org/apache/tiles/definition/dao/CachingLocaleUrlDefinitionDAO.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-core/src/main/java/org/apache/tiles/definition/dao/CachingLocaleUrlDefinitionDAO.java?rev=1331650&r1=1331649&r2=1331650&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-parent/tiles-core/src/main/java/org/apache/tiles/definition/dao/CachingLocaleUrlDefinitionDAO.java (original)
+++ tiles/framework/trunk/tiles-parent/tiles-core/src/main/java/org/apache/tiles/definition/dao/CachingLocaleUrlDefinitionDAO.java Sat Apr 28 01:22:30 2012
@@ -222,7 +222,7 @@ public class CachingLocaleUrlDefinitionD
         Locale parentLocale = LocaleUtil.getParentLocale(customizationKey);
         localeDefsMap = new LinkedHashMap<String, Definition>();
         if (parentLocale != null) {
-            Map<String, Definition> parentDefs = loadParentDefinitions(parentLocale);
+            Map<String, Definition> parentDefs = loadRawDefinitionsFromResources(parentLocale);
             if (parentDefs != null) {
                 localeDefsMap.putAll(parentDefs);
             }