Author: markt
Date: Mon Mar 28 19:19:23 2011
New Revision: 1086352
URL: http://svn.apache.org/viewvc?rev=1086352&view=rev
Log:
Protect against things going wrong during access logging. An un-handled
exception here could trigger some unexpected code paths.
Possible contributing factor to
https://issues.apache.org/bugzilla/show_bug.cgi?id=50957 ?
Modified:
tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties
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=1086352&r1=1086351&r2=1086352&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java Mon Mar
28 19:19:23 2011
@@ -482,8 +482,13 @@ public class CoyoteAdapter implements Ad
(connector.getURIEncoding());
}
- connector.getService().getContainer().logAccess(
- request, response, time, true);
+ try {
+ connector.getService().getContainer().logAccess(
+ request, response, time, true);
+ } catch (Throwable t) {
+ ExceptionUtils.handleThrowable(t);
+ log.warn(sm.getString("coyoteAdapter.accesslogFail"), t);
+ }
if (create) {
request.recycle();
Modified:
tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties?rev=1086352&r1=1086351&r2=1086352&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/LocalStrings.properties Mon
Mar 28 19:19:23 2011
@@ -36,6 +36,7 @@ coyoteAdapter.service=An exception or er
coyoteAdapter.read=The servlet did not read all available bytes during the
processing of the read event
coyoteAdapter.parsePathParam=Unable to parse the path parameters using
encoding [{0}]. The path parameters in the URL will be ignored.
coyoteAdapter.debug=The variable [{0}] has value [{1}]
+coyoteAdapter.accesslogFail=Exception while attempting to add an entry to the
access log
#
# CoyoteResponse
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
