| commit | a5d7c772dd8f2d1399ed11b2693ce7e7b9366a1a | [log] [tgz] |
|---|---|---|
| author | Nicolas LE BAS <nlebas@apache.org> | Sat Apr 28 01:22:06 2012 +0000 |
| committer | Nicolas LE BAS <nlebas@apache.org> | Sat Apr 28 01:22:06 2012 +0000 |
| tree | 337568dd1570f7045d985109c3fab3c72028039d | |
| parent | 8c66d6a401fa26e1ffdf0fb1224e373394db4543 [diff] |
TILES-547 disabled the use of cache for loading raw definitions (the cache contains only non-wildcard or resolved definitions) git-svn-id: https://svn.apache.org/repos/asf/tiles/framework/branches/TILES_2_2_X@1331649 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/tiles-core/src/main/java/org/apache/tiles/definition/dao/CachingLocaleUrlDefinitionDAO.java b/tiles-core/src/main/java/org/apache/tiles/definition/dao/CachingLocaleUrlDefinitionDAO.java index 2fc7e31..41dc424 100644 --- a/tiles-core/src/main/java/org/apache/tiles/definition/dao/CachingLocaleUrlDefinitionDAO.java +++ b/tiles-core/src/main/java/org/apache/tiles/definition/dao/CachingLocaleUrlDefinitionDAO.java
@@ -253,7 +253,7 @@ Locale parentLocale = LocaleUtil.getParentLocale(customizationKey); localeDefsMap = new LinkedHashMap<String, Definition>(); if (parentLocale != null) { - Map<String, Definition> parentDefs = loadParentDefinitions(parentLocale); + Map<String, Definition> parentDefs = loadRawDefinitionsFromURLs(parentLocale); if (parentDefs != null) { localeDefsMap.putAll(parentDefs); }