From c5494fc7c0ffd1adb3e524251d022a19af6f9fdc Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sun, 27 Feb 2011 15:53:45 +0000
Subject: [PATCH] Misc clean-up - remove unused code - suppress FindBugs false
 positives - add javadoc

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1075083 13f79535-47bb-0310-9956-ffa450edef68
---
 .../apache/catalina/authenticator/AuthenticatorBase.java  | 15 +++++++++------
 res/findbugs/filter-false-positives.xml                   |  5 +++++
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/java/org/apache/catalina/authenticator/AuthenticatorBase.java b/java/org/apache/catalina/authenticator/AuthenticatorBase.java
index 2983fcacd..877d2698a 100644
--- a/java/org/apache/catalina/authenticator/AuthenticatorBase.java
+++ b/java/org/apache/catalina/authenticator/AuthenticatorBase.java
@@ -92,12 +92,6 @@ public abstract class AuthenticatorBase extends ValveBase
 
 
     /**
-     * The number of random bytes to include when generating a
-     * session identifier.
-     */
-    protected static final int SESSION_ID_BYTES = 16;
-
-    /**
      * Authentication header
      */
     protected static final String AUTH_HEADER_NAME = "WWW-Authenticate";
@@ -789,6 +783,15 @@ public abstract class AuthenticatorBase extends ValveBase
 
     protected abstract String getAuthMethod();
 
+    /**
+     * Process the login request.
+     * 
+     * @param request   Associated request
+     * @param username  The user
+     * @param password  The password
+     * @return          The authenticated Principal
+     * @throws ServletException
+     */
     protected Principal doLogin(Request request, String username,
             String password) throws ServletException {
         Principal p = context.getRealm().authenticate(username, password);
diff --git a/res/findbugs/filter-false-positives.xml b/res/findbugs/filter-false-positives.xml
index 04a1ce38d..fb8dfe8c2 100644
--- a/res/findbugs/filter-false-positives.xml
+++ b/res/findbugs/filter-false-positives.xml
@@ -37,6 +37,11 @@
     <Bug code="REC"/>
   </Match>
   <Match>
+    <Class name="org.apache.catalina.authenticator.AuthenticatorBase"/>
+    <Field name="sessionIdGenerator"/>
+    <Bug code="IS"/>
+  </Match>
+  <Match>
     <!-- JNI library can only be loaded once so statics are appropriate -->
     <Class name="org.apache.catalina.core.AprLifecycleListener" />
     <Bug code="ST" />
-- 
2.11.0