You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2006/08/26 15:31:44 UTC

svn commit: r437164 - /incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/RollerSession.java

Author: snoopdave
Date: Sat Aug 26 06:31:43 2006
New Revision: 437164

URL: http://svn.apache.org/viewvc?rev=437164&view=rev
Log:
Preventing NPE that occurs on some URLs

Modified:
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/RollerSession.java

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/RollerSession.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/RollerSession.java?rev=437164&r1=437163&r2=437164&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/RollerSession.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/RollerSession.java Sat Aug 26 06:31:43 2006
@@ -197,7 +197,7 @@
     private boolean hasPermissions(WebsiteData website, short mask) 
     {
         UserData user = getAuthenticatedUser();
-        if (user != null) 
+        if (website != null && user != null) 
         {
             return website.hasUserPermissions(user, mask);
         }