Author: markt
Date: Sun Mar 6 07:33:58 2011
New Revision: 1078412
URL: http://svn.apache.org/viewvc?rev=1078412&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50855
Fix NPE on HttpServletRequest.logout() when debug logging is enabled.
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
tomcat/trunk/webapps/docs/changelog.xml
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java?rev=1078412&r1=1078411&r2=1078412&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
Sun Mar 6 07:33:58 2011
@@ -686,9 +686,11 @@ public abstract class AuthenticatorBase
Principal principal, String authType,
String username, String password) {
- if (log.isDebugEnabled())
- log.debug("Authenticated '" + principal.getName() + "' with type '"
- + authType + "'");
+ if (log.isDebugEnabled()) {
+ 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/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1078412&r1=1078411&r2=1078412&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Sun Mar 6 07:33:58 2011
@@ -43,6 +43,14 @@
Other
-->
<section name="Tomcat 7.0.11 (markt)">
+ <subsection name="Catalina">
+ <changelog>
+ <fix>
+ <bug>50855</bug>: Fix NPE on HttpServletRequest.logout() when debug
+ logging is enabled. (markt)
+ </fix>
+ </changelog>
+ </subsection>
<subsection name="Jasper">
<changelog>
<fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
