From 38186c027036027e254b33f6d2d10c58089aa13d Mon Sep 17 00:00:00 2001 From: markt Date: Mon, 6 Sep 2010 09:55:44 +0000 Subject: [PATCH] Extend fix for bz49883 git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@992987 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/catalina/realm/LockOutRealm.java | 11 +++++++++++ webapps/docs/changelog.xml | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/java/org/apache/catalina/realm/LockOutRealm.java b/java/org/apache/catalina/realm/LockOutRealm.java index 638c1bda0..5edb34da7 100644 --- a/java/org/apache/catalina/realm/LockOutRealm.java +++ b/java/org/apache/catalina/realm/LockOutRealm.java @@ -45,6 +45,11 @@ public class LockOutRealm extends CombinedRealm { 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 CombinedRealm { } + @Override + protected String getName() { + return name; + } + + /** * Set the period for which an account will be locked. * @param lockOutTime the lockOutTime to set diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 551d5e9f6..92610a1d1 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -119,8 +119,8 @@ BCEL code. Based on a patch by Gábor. (markt) - 49883: Ensure that the CombinedRealm returns a name for use - in log messages rather than throwing an + 49883: Ensure that the CombinedRealm and LockOutRealm return + a name for use in log messages rather than throwing an UnsupportedOperationException. (markt) -- 2.11.0