Author: rjung
Date: Tue Mar 24 11:25:50 2009
New Revision: 757737

URL: http://svn.apache.org/viewvc?rev=757737&view=rev
Log:
Remove wrong "No role found" realm debug log message,
even if a role was found.

Modified:
    
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/realm/RealmBase.java
    tomcat/container/tc5.5.x/webapps/docs/changelog.xml
    tomcat/current/tc5.5.x/STATUS.txt

Modified: 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/realm/RealmBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/realm/RealmBase.java?rev=757737&r1=757736&r2=757737&view=diff
==============================================================================
--- 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/realm/RealmBase.java
 (original)
+++ 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/realm/RealmBase.java
 Tue Mar 24 11:25:50 2009
@@ -785,9 +785,12 @@
                     log.debug("  No user authenticated, cannot grant access");
             } else {
                 for (int j = 0; j < roles.length; j++) {
-                    if (hasRole(principal, roles[j]))
+                    if (hasRole(principal, roles[j])) {
                         status = true;
-                    if( log.isDebugEnabled() )
+                        if( log.isDebugEnabled() )
+                            log.debug( "Role found:  " + roles[j]);
+                    }
+                    else if( log.isDebugEnabled() )
                         log.debug( "No role found:  " + roles[j]);
                 }
             }

Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=757737&r1=757736&r2=757737&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Tue Mar 24 11:25:50 2009
@@ -35,6 +35,10 @@
   <subsection name="Catalina">
     <changelog>
       <fix>
+        Remove wrong "No role found" realm debug log message,
+        even if a role was found. (rjung)
+      </fix>
+      <fix>
         <bug>41407</bug>: JAAS Realm now works with CLIENT-CERT authentication.
         (markt)
       </fix>

Modified: tomcat/current/tc5.5.x/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=757737&r1=757736&r2=757737&view=diff
==============================================================================
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Tue Mar 24 11:25:50 2009
@@ -66,12 +66,6 @@
   rjung: slightly prefer disabled for 5.5.x because of stability reasons
          and the risk of breaking existing apps. Happy with enabled for 6.0.x 
though.
 
-* Correct wrong "No role found" debug message,
-  logged in RealmBase even if a role was found.
-  http://svn.apache.org/viewvc?rev=697158&view=rev
-  +1: rjung, markt, mturk
-  -1: 
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45026
   Never use empty reason phrase.
   http://svn.apache.org/viewvc?rev=697183&view=rev



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Reply via email to