'SPR-9319 Made non thread safe method getTemplate(String name, Locale…

… locale) in FreeMarkerView synchronized'
spring-projects · Mar 15, 2013 · 16b4cbb · 16b4cbb
1 parent 4812c18
commit 16b4cbb
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/...-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerView.java b/...-webmvc/src/main/java/org/springframework/web/servlet/view/freemarker/FreeMarkerView.java
@@ -345,9 +345,13 @@ protected Template getTemplate(Locale locale) throws IOException {
 	 * @throws IOException if the template file could not be retrieved
 	 */
 	protected Template getTemplate(String name, Locale locale) throws IOException {
-		return (getEncoding() != null ?
-				getConfiguration().getTemplate(name, locale, getEncoding()) :
-				getConfiguration().getTemplate(name, locale));
+        final Template template;
+        synchronized (this) {
+               template = getEncoding() != null ?
+                    getConfiguration().getTemplate(name, locale, getEncoding()) :
+                    getConfiguration().getTemplate(name, locale);
+        }
+        return template;
 	}
 
 	/**