Author: rjung
Date: Thu Sep 25 07:20:55 2008
New Revision: 698982
URL: http://svn.apache.org/viewvc?rev=698982&view=rev
Log:
Backport r697158: Correct wrong "No role found" debug message,
logged in RealmBase even if a role was found.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/RealmBase.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=698982&r1=698981&r2=698982&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Sep 25 07:20:55 2008
@@ -149,12 +149,6 @@
+1: mark, remm
-1:
-* 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, mturk, markt, remm
- -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
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/RealmBase.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/RealmBase.java?rev=698982&r1=698981&r2=698982&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/RealmBase.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/RealmBase.java Thu Sep
25 07:20:55 2008
@@ -787,9 +787,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]);
}
}
@@ -1214,7 +1217,7 @@
/**
- * Digest password using the algorithm especificied and
+ * Digest password using the algorithm specified and
* convert the result to a corresponding hex string.
* If exception, the plain credentials string is returned
*
@@ -1250,7 +1253,7 @@
/**
- * Digest password using the algorithm especificied and
+ * Digest password using the algorithm specified and
* convert the result to a corresponding hex string.
* If exception, the plain credentials string is returned
*/
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=698982&r1=698981&r2=698982&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Sep 25 07:20:55 2008
@@ -35,6 +35,10 @@
<section name="Tomcat 6.0.19 (remm)">
<subsection name="Catalina">
<changelog>
+ <fix>
+ Correct wrong "No role found" debug message,
+ logged in RealmBase even if a role was found. (rjung)
+ </fix>
<fix><bug>44809</bug>Improve AprLifecycleListener Error Messages.
(jfclere)</fix>
<fix>
Log AccessControlException for context specific logging.properties
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
