Author: markt
Date: Sat Oct 13 16:00:11 2012
New Revision: 1397870
URL: http://svn.apache.org/viewvc?rev=1397870&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53993
Avoid NPE when the session is invalidated
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/AccessLogValve.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1397868
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/AccessLogValve.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/AccessLogValve.java?rev=1397870&r1=1397869&r2=1397870&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/AccessLogValve.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/AccessLogValve.java
Sat Oct 13 16:00:11 2012
@@ -44,6 +44,7 @@ import org.apache.catalina.AccessLog;
import org.apache.catalina.Globals;
import org.apache.catalina.LifecycleException;
import org.apache.catalina.LifecycleState;
+import org.apache.catalina.Session;
import org.apache.catalina.connector.Request;
import org.apache.catalina.connector.Response;
import org.apache.coyote.RequestInfo;
@@ -1728,15 +1729,15 @@ public class AccessLogValve extends Valv
@Override
public void addElement(StringBuilder buf, Date date, Request request,
Response response, long time) {
- if (request != null) {
- if (request.getSession(false) != null) {
- buf.append(request.getSessionInternal(false)
- .getIdInternal());
- } else {
+ if (request == null) {
+ buf.append('-');
+ } else {
+ Session session = request.getSessionInternal(false);
+ if (session == null) {
buf.append('-');
+ } else {
+ buf.append(session.getIdInternal());
}
- } else {
- buf.append('-');
}
}
}
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1397870&r1=1397869&r2=1397870&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Sat Oct 13 16:00:11 2012
@@ -54,6 +54,14 @@
issues to not "pop up" wrt. others).
-->
<section name="Tomcat 7.0.33 (markt)">
+ <subsection name="Catalina">
+ <changelog>
+ <fix>
+ <bug>53993</bug>: Avoid a possible NPE in the AccessLogValve when the
+ session ID is logged and a session is invalidated. (markt)
+ </fix>
+ </changelog>
+ </subsection>
<subsection name="Coyote">
<changelog>
<fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
