You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2012/10/13 17:56:21 UTC
svn commit: r1397868 -
/tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java
Author: markt
Date: Sat Oct 13 15:56:21 2012
New Revision: 1397868
URL: http://svn.apache.org/viewvc?rev=1397868&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53993
Avoid NPE when the session is invalidated
Modified:
tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java
Modified: tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java?rev=1397868&r1=1397867&r2=1397868&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java Sat Oct 13 15:56:21 2012
@@ -46,6 +46,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;
@@ -1860,15 +1861,15 @@ public class AccessLogValve extends Valv
@Override
public void addElement(CharArrayWriter 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('-');
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org