You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@struts.apache.org by mr...@apache.org on 2008/01/23 14:12:59 UTC

svn commit: r614528 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java

Author: mrdon
Date: Wed Jan 23 05:12:57 2008
New Revision: 614528

URL: http://svn.apache.org/viewvc?rev=614528&view=rev
Log:
Removing final to support subclasses returning different freemarker configuration
WW-2257

Modified:
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java?rev=614528&r1=614527&r2=614528&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java Wed Jan 23 05:12:57 2008
@@ -148,7 +148,7 @@
         this.tagLibraries = Collections.unmodifiableMap(map);
     }
 
-    public final synchronized freemarker.template.Configuration getConfiguration(ServletContext servletContext) throws TemplateException {
+    public synchronized freemarker.template.Configuration getConfiguration(ServletContext servletContext) throws TemplateException {
         freemarker.template.Configuration config = (freemarker.template.Configuration) servletContext.getAttribute(CONFIG_SERVLET_CONTEXT_KEY);
 
         if (config == null) {