Author: markt
Date: Mon Sep 6 09:55:44 2010
New Revision: 992987
URL: http://svn.apache.org/viewvc?rev=992987&view=rev
Log:
Extend fix for bz49883
Modified:
tomcat/trunk/java/org/apache/catalina/realm/LockOutRealm.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/realm/LockOutRealm.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/LockOutRealm.java?rev=992987&r1=992986&r2=992987&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/LockOutRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/LockOutRealm.java Mon Sep 6
09:55:44 2010
@@ -45,6 +45,11 @@ public class LockOutRealm extends Combin
private static final Log log = LogFactory.getLog(LockOutRealm.class);
/**
+ * Descriptive information about this Realm implementation.
+ */
+ protected static final String name = "LockOutRealm";
+
+ /**
* The number of times in a row a user has to fail authentication to be
* locked out. Defaults to 5.
*/
@@ -318,6 +323,12 @@ public class LockOutRealm extends Combin
}
+ @Override
+ protected String getName() {
+ return name;
+ }
+
+
/**
* Set the period for which an account will be locked.
* @param lockOutTime the lockOutTime to set
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=992987&r1=992986&r2=992987&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Sep 6 09:55:44 2010
@@ -119,8 +119,8 @@
BCEL code. Based on a patch by Gábor. (markt)
</fix>
<fix>
- <bug>49883</bug>: Ensure that the CombinedRealm returns a name for use
- in log messages rather than throwing an
+ <bug>49883</bug>: Ensure that the CombinedRealm and LockOutRealm return
+ a name for use in log messages rather than throwing an
<code>UnsupportedOperationException</code>. (markt)
</fix>
<fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
