Skip to content

VELTOOLS-198 #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
odoral wants to merge 1 commit into
base: master
Choose a base branch
from
Open

VELTOOLS-198 #12

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions velocity-tools-generic/src/main/java/org/apache/velocity/tools/ConversionUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,6 @@
import java.util.Locale;
import java.util.Map;
import java.util.TimeZone;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.ConcurrentHashMap;
import org.apache.commons.lang3.ArrayUtils;
import org.slf4j.LoggerFactory;

Expand All @@ -66,7 +64,7 @@ public class ConversionUtils
private static final int STYLE_INTEGER = 4;

// cache custom formats
private static ConcurrentMap<String,NumberFormat> customFormatsCache = new ConcurrentHashMap<String,NumberFormat>();
private static final ThreadLocal<Map<String, NumberFormat>> CUSTOM_FORMATS_CACHE = ThreadLocal.withInitial(HashMap::new);

private ConversionUtils() {}

Expand Down Expand Up @@ -102,11 +100,11 @@ public static NumberFormat getNumberFormat(String format, Locale locale)
{
// we have a custom format
String cacheKey = format + "%" + locale.toString();
nf = customFormatsCache.get(cacheKey);
nf = CUSTOM_FORMATS_CACHE.get().get(cacheKey);
if( nf == null )
{
nf = new DecimalFormat(format, new DecimalFormatSymbols(locale));
customFormatsCache.put(cacheKey,nf);
CUSTOM_FORMATS_CACHE.get().put(cacheKey,nf);
}
}
else
Expand Down