COCOON-2243: Handle case in ApplicationUtil.isUserInRole(..) when Use…

…r is null. git-svn-id: https://svn.apache.org/repos/asf/cocoon/trunk@693535 13f79535-47bb-0310-9956-ffa450edef68
apache · Sep 9, 2008 · 8d09120 · 8d09120
1 parent 88754cb
commit 8d09120
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 12 deletions.
diff --git a/blocks/cocoon-auth/cocoon-auth-api/src/changes/changes.xml b/blocks/cocoon-auth/cocoon-auth-api/src/changes/changes.xml
@@ -22,13 +22,17 @@
     |
     | @version $Id$
     +-->
-    <document>
-      <body>
-        <release version="1.0.0-M1" date="2007-??-??" description="unreleased">    
-          <action dev="reinhard" type="add">
-            Initial creation.
-          </action>      
-        </release>
-      </body>
-    </document>
-
+<document>
+  <body>
+    <release version="1.0.1" date="TBD" description="unreleased">
+      <action dev="joerg" type="add" issue="COCOON-2243" due-to="Benjamin Boksa" due-to-email="benjamin@boksa.de">
+        Handle case in ApplicationUtil.isUserInRole(..) when User is null.
+      </action>
+    </release>
+    <release version="1.0.0" date="2008-03-26" description="released">
+      <action dev="reinhard" type="add">
+        Initial creation.
+      </action>
+    </release>
+  </body>
+</document>
diff --git a/blocks/cocoon-auth/cocoon-auth-api/src/main/java/org/apache/cocoon/auth/ApplicationUtil.java b/blocks/cocoon-auth/cocoon-auth-api/src/main/java/org/apache/cocoon/auth/ApplicationUtil.java
@@ -1,4 +1,4 @@
-/* 
+/*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
@@ -76,7 +76,10 @@ public static Object getData(final Map objectModel) {
      * @return This returns true, if the user has the role; otherwise false is returned.
      */
     public static boolean isUserInRole(final User user, final String role, final Map objectModel) {
-        boolean result = user.isUserInRole(role);
+        boolean result = false;
+        if (user != null) {
+            result = user.isUserInRole(role);
+        }
         if ( !result ) {
             final Request req = ObjectModelHelper.getRequest(objectModel);
             result = req.isUserInRole(role);