Author: markt
Date: Tue Aug 16 08:58:35 2011
New Revision: 1158158
URL: http://svn.apache.org/viewvc?rev=1158158&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51658
Fix copy/paste error that could trigger an NPE.
Based on a suggestion by Felix Schumacher
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 16 08:58:35 2011
@@ -1 +1 @@
-/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157810,1157832,1157834,1157847,1157908,1157939
+/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157810,1157832,1157834,1157847,1157908,1157939,1158155
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java?rev=1158158&r1=1158157&r2=1158158&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
Tue Aug 16 08:58:35 2011
@@ -500,7 +500,7 @@ public class CoyoteAdapter implements Ad
request, response, time, true);
} else if (request.mappingData.host != null) {
logged = true;
- ((Context) request.mappingData.context).logAccess(
+ ((Host) request.mappingData.host).logAccess(
request, response, time, true);
}
}
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=1158158&r1=1158157&r2=1158158&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Aug 16 08:58:35 2011
@@ -85,6 +85,10 @@
<bug>51654</bug>: Improve handling of invalid appBase settings for Host
elements. (markt)
</fix>
+ <fix>
+ <bug>51658</bug>: Fix possible NPE when logging a failed request. Based
+ on a suggestion by Felix Schumacher. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
