commit ddc281c2a1448b991a3ec5331f75d8e299516a9a
author Daniel Dekany <ddekany@freemail.hu> Sun Apr 21 21:10:54 2013 +0200
committer Daniel Dekany <ddekany@freemail.hu> Sun Apr 21 21:10:54 2013 +0200
tree 91f8bf26d5015fb270f7afda5933a510bce9cb4e
parent 0d480062a668e34cdce090d84301f58bf4b233ff

Bugfix [3608470]: Configuration.getEncoding(Locale) wasn't thread-safe if it was called with Locale variations that weren't registered and a less specific matching entry was found.

src/main/java/freemarker/template/Configuration.java

diff --git a/src/main/java/freemarker/template/Configuration.java b/src/main/java/freemarker/template/Configuration.java
index 4623050..50eecb7 100644
--- a/src/main/java/freemarker/template/Configuration.java
+++ b/src/main/java/freemarker/template/Configuration.java
@@ -67,6 +67,7 @@
 import java.util.Set;
 import java.util.SortedMap;
 import java.util.TreeMap;
+import java.util.concurrent.ConcurrentHashMap;
 
 import javax.servlet.ServletContext;
 
@@ -137,7 +138,7 @@
 
     private TemplateCache cache;
     private HashMap variables = new HashMap();
-    private HashMap encodingMap = new HashMap();
+    private Map encodingMap = new ConcurrentHashMap();
     private Map autoImportMap = new HashMap();
     private ArrayList autoImports = new ArrayList(), autoIncludes = new ArrayList();
     private String defaultEncoding = SecurityUtilities.getSystemProperty("file.encoding");