Author: remm
Date: Wed Mar 5 10:33:16 2014
New Revision: 1574413
URL: http://svn.apache.org/r1574413
Log:
Use the log fallback to log access anyway when something unexpected occurs. Do
the same at the end of event to avoid the possibility of skipping recycling.
Modified:
tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
Modified: tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java?rev=1574413&r1=1574412&r2=1574413&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java Wed Mar
5 10:33:16 2014
@@ -260,10 +260,15 @@ public class CoyoteAdapter implements Ad
req.getRequestProcessor().setWorkerThreadName(null);
// Recycle the wrapper request and response
if (error || response.isClosed() || !request.isComet()) {
- request.getMappingData().context.logAccess(
- request, response,
- System.currentTimeMillis() - req.getStartTime(),
- false);
+ if (request.getMappingData().context != null) {
+ request.getMappingData().context.logAccess(
+ request, response,
+ System.currentTimeMillis() - req.getStartTime(),
+ false);
+ } else {
+ // Should normally not happen
+ log(req, res, System.currentTimeMillis() -
req.getStartTime());
+ }
request.recycle();
request.setFilterChain(null);
response.recycle();
@@ -431,6 +436,9 @@ public class CoyoteAdapter implements Ad
request, response,
System.currentTimeMillis() - req.getStartTime(),
false);
+ } else {
+ // Should normally not happen
+ log(req, res, System.currentTimeMillis() -
req.getStartTime());
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
