Author: yoavs
Date: Tue Dec 26 16:55:59 2006
New Revision: 490421

URL: http://svn.apache.org/viewvc?view=rev&rev=490421
Log:
Bugzilla 39255: NPE in AuthenticatorBase when logging level is DEBUG and no 
principal available

Modified:
    
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/authenticator/AuthenticatorBase.java
    tomcat/container/tc5.5.x/webapps/docs/changelog.xml
    tomcat/container/tc5.5.x/webapps/docs/config/loader.xml

Modified: 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/authenticator/AuthenticatorBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/authenticator/AuthenticatorBase.java?view=diff&rev=490421&r1=490420&r2=490421
==============================================================================
--- 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/authenticator/AuthenticatorBase.java
 (original)
+++ 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/authenticator/AuthenticatorBase.java
 Tue Dec 26 16:55:59 2006
@@ -703,9 +703,12 @@
                             Principal principal, String authType,
                             String username, String password) {
 
-        if (log.isDebugEnabled())
-            log.debug("Authenticated '" + principal.getName() + "' with type '"
+        if (log.isDebugEnabled()) {
+            // Bugzilla 39255: 
http://issues.apache.org/bugzilla/show_bug.cgi?id=39255
+            String name = (principal == null) ? "none" : principal.getName();
+            log.debug("Authenticated '" + name + "' with type '"
                 + authType + "'");
+        }
 
         // Cache the authentication information in our request
         request.setAuthType(authType);

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?view=diff&rev=490421&r1=490420&r2=490421
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Tue Dec 26 16:55:59 2006
@@ -179,6 +179,10 @@
         <bug>40177</bug>: add more warnings to documentation about 
RequestDumperValve
         character encoding.  Deprecate this Valve in favor of 
RequestDumperFilter. (yoavs)
       </fix>
+      <fix>
+        <bug>39255</bug>: NPE in AuthenticatorBase when logging level is set 
to DEBUG
+        and no prinicpal found. (yoavs)
+      </fix>
     </changelog>
   </subsection> 
   <subsection name="Coyote">

Modified: tomcat/container/tc5.5.x/webapps/docs/config/loader.xml
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/config/loader.xml?view=diff&rev=490421&r1=490420&r2=490421
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/config/loader.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/config/loader.xml Tue Dec 26 16:55:59 
2006
@@ -106,13 +106,6 @@
 
     <attributes>
 
-      <attribute name="backgroundProcesssorDelay" required="false">
-        <p>The number of seconds between checks for modified classes and
-        resources, if <code>reloadable</code> has been set to
-        <code>true</code>.</p>
-        <p>See the general documentation for this parameter at <a 
href="../host.html">Host Container</a>.</p>
-      </attribute>
-
       <attribute name="loaderClass" required="false">
         <p>Java class name of the <code>java.lang.ClassLoader</code>
         implementation class to use.  If not specified, the default value is



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to