svn commit: r1488660 - /incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/WikiJSPFilter.java

[juanpablo]

Author: juanpablo
Date: Sun Jun  2 10:54:56 2013
New Revision: 1488660

URL: http://svn.apache.org/r1488660
Log:
fixed runtime NPE on WikiJSPFilter (m_engine used before having been 
initialized)

Modified:
    
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/WikiJSPFilter.java

Modified: 
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/WikiJSPFilter.java
URL: 
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/WikiJSPFilter.java?rev=1488660&r1=1488659&r2=1488660&view=diff
==============================================================================
--- 
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/WikiJSPFilter.java
 (original)
+++ 
incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/ui/WikiJSPFilter.java
 Sun Jun  2 10:54:56 2013
@@ -68,12 +68,13 @@ import org.apache.wiki.util.WatchDog;
 public class WikiJSPFilter extends WikiServletFilter
 {
     private Boolean m_useOutputStream;
-    private String m_wiki_encoding = 
m_engine.getWikiProperties().getProperty(WikiEngine.PROP_ENCODING);
+    private String m_wiki_encoding;
 
     /** {@inheritDoc} */
     public void init( FilterConfig config ) throws ServletException
     {
         super.init( config );
+        m_wiki_encoding = 
m_engine.getWikiProperties().getProperty(WikiEngine.PROP_ENCODING);
         ServletContext context = config.getServletContext();
         m_useOutputStream = UtilJ2eeCompat.useOutputStream( 
context.getServerInfo() );
     }