svn commit: r932040 - in /incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH: ChangeLog src/com/ecyrd/jspwiki/Release.java src/com/ecyrd/jspwiki/WikiEngine.java

[metskem]

Author: metskem
Date: Thu Apr  8 18:05:38 2010
New Revision: 932040

URL: http://svn.apache.org/viewvc?rev=932040&view=rev
Log:
2.8.4-svn-10    * JSPWIKI-644: NPE after page externally modified, reported by 
Fabian Haupt.

Modified:
    incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog
    
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/Release.java
    
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/WikiEngine.java

Modified: incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog
URL: 
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog?rev=932040&r1=932039&r2=932040&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/ChangeLog Thu Apr  8 18:05:38 
2010
@@ -1,3 +1,9 @@
+2010-04-08  Harry Metske <mets...@apache.org>
+
+        * 2.8.4-svn-10
+        
+        * JSPWIKI-644: NPE after page externally modified, reported by Fabian 
Haupt.
+
 2010-02-21  Janne Jalkanen <jalka...@apache.org>
 
         * 2.8.4-svn-9

Modified: 
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/Release.java
URL: 
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/Release.java?rev=932040&r1=932039&r2=932040&view=diff
==============================================================================
--- 
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/Release.java
 (original)
+++ 
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/Release.java
 Thu Apr  8 18:05:38 2010
@@ -77,7 +77,7 @@ public final class Release
      *  <p>
      *  If the build identifier is empty, it is not added.
      */
-    public static final String     BUILD         = "9";
+    public static final String     BUILD         = "10";
     
     /**
      *  This is the generic version string you should use

Modified: 
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/WikiEngine.java
URL: 
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/WikiEngine.java?rev=932040&r1=932039&r2=932040&view=diff
==============================================================================
--- 
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/WikiEngine.java
 (original)
+++ 
incubator/jspwiki/branches/JSPWIKI_2_8_BRANCH/src/com/ecyrd/jspwiki/WikiEngine.java
 Thu Apr  8 18:05:38 2010
@@ -1640,7 +1640,7 @@ public class WikiEngine
             StopWatch sw = new StopWatch();
             sw.start();
 
-            if( runFilters )
+            if( runFilters && m_filterManager != null )
                 pagedata = m_filterManager.doPreTranslateFiltering( context, 
pagedata );
 
             MarkupParser mp = m_renderingManager.getParser( context, pagedata 
);
@@ -1659,7 +1659,7 @@ public class WikiEngine
             {
                 result = m_renderingManager.getHTML( context, doc );
 
-                if( runFilters )
+                if( runFilters && m_filterManager != null )
                     result = m_filterManager.doPostTranslateFiltering( 
context, result );
             }