Author: ajaquith
Date: Sun Apr 19 22:23:30 2009
New Revision: 766534
URL: http://svn.apache.org/viewvc?rev=766534&view=rev
Log:
Fixed NPE in PermissionTag.
Modified:
incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/PermissionTag.java
Modified:
incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/PermissionTag.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/PermissionTag.java?rev=766534&r1=766533&r2=766534&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/PermissionTag.java
(original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/PermissionTag.java
Sun Apr 19 22:23:30 2009
@@ -24,6 +24,7 @@
import java.security.Permission;
import org.apache.commons.lang.StringUtils;
+import org.apache.wiki.WikiEngine;
import org.apache.wiki.WikiProvider;
import org.apache.wiki.WikiSession;
import org.apache.wiki.action.GroupActionBean;
@@ -152,11 +153,15 @@
{
try
{
- WikiPage latest = m_wikiContext.getEngine().getPage(
page.getName() );
- if( page.getVersion() != WikiProvider.LATEST_VERSION &&
- latest.getVersion() != page.getVersion() )
+ WikiEngine engine = m_wikiContext.getEngine();
+ if ( engine.pageExists( page ) )
{
- return false;
+ WikiPage latest = engine.getPage( page.getName() );
+ if( page.getVersion() != WikiProvider.LATEST_VERSION &&
+ latest.getVersion() != page.getVersion() )
+ {
+ return false;
+ }
}
}
catch( Exception e )
