root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

MessageSourceSupport uses locale-specific MessageFormat cache for default messages 

Issue: SPR-9607
This commit is contained in:
Juergen Hoeller 2012-08-30 16:30:18 +02:00
parent 95adf1dbee
commit cec30a7a2d
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
spring-context/src/main/java/org/springframework/context/support/MessageSourceSupport.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2010 the original author or authors. * Copyright 2002-2012 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -52,7 +52,8 @@ public abstract class MessageSourceSupport {
* Used for passed-in default messages. MessageFormats for resolved * Used for passed-in default messages. MessageFormats for resolved
* codes are cached on a specific basis in subclasses. * codes are cached on a specific basis in subclasses.
*/ */
private final Map<String, MessageFormat> cachedMessageFormats = new HashMap<String, MessageFormat>(); private final Map<String, Map<Locale, MessageFormat>> messageFormatsPerMessage =
new HashMap<String, Map<Locale, MessageFormat>>();
/** /**
@ -114,9 +115,16 @@ public abstract class MessageSourceSupport {
if (msg == null || (!this.alwaysUseMessageFormat && ObjectUtils.isEmpty(args))) { if (msg == null || (!this.alwaysUseMessageFormat && ObjectUtils.isEmpty(args))) {
return msg; return msg;
} }
MessageFormat messageFormat; MessageFormat messageFormat = null;
synchronized (this.cachedMessageFormats) { synchronized (this.messageFormatsPerMessage) {
messageFormat = this.cachedMessageFormats.get(msg); Map<Locale, MessageFormat> messageFormatsPerLocale = this.messageFormatsPerMessage.get(msg);
if (messageFormatsPerLocale != null) {
messageFormat = messageFormatsPerLocale.get(locale);
}
else {
messageFormatsPerLocale = new HashMap<Locale, MessageFormat>();
this.messageFormatsPerMessage.put(msg, messageFormatsPerLocale);
}
if (messageFormat == null) { if (messageFormat == null) {
try { try {
messageFormat = createMessageFormat(msg, locale); messageFormat = createMessageFormat(msg, locale);
@ -130,7 +138,7 @@ public abstract class MessageSourceSupport {
// silently proceed with raw message if format not enforced // silently proceed with raw message if format not enforced
messageFormat = INVALID_MESSAGE_FORMAT; messageFormat = INVALID_MESSAGE_FORMAT;
} }
this.cachedMessageFormats.put(msg, messageFormat); messageFormatsPerLocale.put(locale, messageFormat);
} }
} }
if (messageFormat == INVALID_MESSAGE_FORMAT) { if (messageFormat == INVALID_MESSAGE_FORMAT) {
@ -153,9 +161,8 @@ public abstract class MessageSourceSupport {
/** /**
* Template method for resolving argument objects. * Template method for resolving argument objects.
* <p>The default implementation simply returns the given argument * <p>The default implementation simply returns the given argument array as-is.
* array as-is. Can be overridden in subclasses in order to resolve * Can be overridden in subclasses in order to resolve special argument types.
* special argument types.
* @param args the original argument array * @param args the original argument array
* @param locale the Locale to resolve against * @param locale the Locale to resolve against
* @return the resolved argument array * @return the resolved argument array