[Jboss-svn-commits] JBL Code SVN: r1975 - trunk/labs/jbossweb/src/share/classes/org/apache/catalina/realm

[<jbo...@li...>]

Author: rem...@jb...
Date: 2006-01-03 07:46:31 -0500 (Tue, 03 Jan 2006)
New Revision: 1975

Modified:
   trunk/labs/jbossweb/src/share/classes/org/apache/catalina/realm/RealmBase.java
Log:
- Another change for * ...

Modified: trunk/labs/jbossweb/src/share/classes/org/apache/catalina/realm/RealmBase.java
===================================================================
--- trunk/labs/jbossweb/src/share/classes/org/apache/catalina/realm/RealmBase.java	2006-01-03 10:57:42 UTC (rev 1974)
+++ trunk/labs/jbossweb/src/share/classes/org/apache/catalina/realm/RealmBase.java	2006-01-03 12:46:31 UTC (rev 1975)
@@ -60,7 +60,7 @@
  * location) are identical to those currently supported by Tomcat 3.X.
  *
  * @author Craig R. McClanahan
- * @version $Revision: 355701 $ $Date: 2005-12-10 03:53:21 +0100 (sam., 10 déc. 2005) $
+ * @version $Revision: 365363 $ $Date: 2006-01-02 16:46:04 +0100 (lun., 02 janv. 2006) $
  */
 
 public abstract class RealmBase
@@ -728,13 +728,18 @@
         boolean denyfromall = false;
         for(int i=0; i < constraints.length; i++) {
             SecurityConstraint constraint = constraints[i];
-            String roles[] = constraint.findAuthRoles();
+
+            String roles[];
+            if (constraint.getAllRoles()) {
+                // * means all roles defined in web.xml
+                roles = request.getContext().findSecurityRoles();
+            } else {
+                roles = constraint.findAuthRoles();
+            }
+
             if (roles == null)
                 roles = new String[0];
 
-            if (constraint.getAllRoles() && !denyfromall)
-                status = true;
-
             if (log.isDebugEnabled())
                 log.debug("  Checking roles " + principal);