From c0cbb5405dece935cba09d9332ff8d5595438a4a Mon Sep 17 00:00:00 2001 From: markt Date: Tue, 28 Jun 2011 07:15:02 +0000 Subject: [PATCH] No need for a ConcurrentHashMap now pre-population is used. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1140461 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/tomcat/util/buf/B2CConverter.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/java/org/apache/tomcat/util/buf/B2CConverter.java b/java/org/apache/tomcat/util/buf/B2CConverter.java index 4b6e15e3a..d59162b58 100644 --- a/java/org/apache/tomcat/util/buf/B2CConverter.java +++ b/java/org/apache/tomcat/util/buf/B2CConverter.java @@ -23,8 +23,9 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.io.UnsupportedEncodingException; import java.nio.charset.Charset; +import java.util.HashMap; import java.util.Locale; -import java.util.concurrent.ConcurrentHashMap; +import java.util.Map; import org.apache.tomcat.util.res.StringManager; @@ -48,8 +49,8 @@ public class B2CConverter { private static final StringManager sm = StringManager.getManager(Constants.Package); - private static final ConcurrentHashMap encodingToCharsetCache = - new ConcurrentHashMap(); + private static final Map encodingToCharsetCache = + new HashMap(); static { for (Charset charset: Charset.availableCharsets().values()) { -- 2.11.0