commit d49fa768f72dfa732ea99e4e562e27846a12f02a
author Michael Semb Wever <mck@apache.org> Wed Jul 13 12:19:30 2016 +0000
committer Michael Semb Wever <mck@apache.org> Wed Jul 13 12:19:30 2016 +0000
tree 1298e55a3c641cefc36ac9e9a8164795f29a4039
parent ef1a1b92a6d9ec3f22c4205fa612f1c5793da6eb

forward port commit 1752405 to trunk using
    svn merge -c1752405 ^/tiles/framework/branches/TILES_3_0_X .

TILES-585 – Definition cascade attributes duplicated values under high load


git-svn-id: https://svn.apache.org/repos/asf/tiles/framework/trunk@1752407 13f79535-47bb-0310-9956-ffa450edef68

tiles-core/src/main/java/org/apache/tiles/definition/dao/CachingLocaleUrlDefinitionDAO.java

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 cee95a3..20f13db 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
@@ -167,6 +167,11 @@
      * @since 2.1.0
      */
     protected synchronized Map<String, Definition> checkAndloadDefinitions(Locale customizationKey) {
+        Map<String, Definition> existingDefinitions = locale2definitionMap.get(customizationKey);
+        boolean definitionsAlreadyLoaded = existingDefinitions != null;
+        if (definitionsAlreadyLoaded) {
+            return existingDefinitions;
+        }
         if (checkRefresh && refreshRequired()) {
             locale2definitionMap.clear();
             definitionResolver.clearPatternPaths(customizationKey);