Author: remm
Date: Tue Nov 3 17:55:48 2015
New Revision: 1712358
URL: http://svn.apache.org/viewvc?rev=1712358&view=rev
Log:
58578: Avoid NPE when trying to do access logging on cookies for an unmapped
request.
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/Request.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/Request.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/Request.java?rev=1712358&r1=1712357&r2=1712358&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/Request.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/connector/Request.java Tue
Nov 3 17:55:48 2015
@@ -2965,6 +2965,10 @@ public class Request
cookiesConverted = true;
+ if (getContext() == null) {
+ return;
+ }
+
parseCookies();
ServerCookies serverCookies = coyoteRequest.getCookies();
Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1712358&r1=1712357&r2=1712358&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Tue Nov 3 17:55:48 2015
@@ -134,6 +134,10 @@
to occur even in blocking mode, which caused problems with NIO2.
(remm)
</fix>
+ <fix>
+ <bug>58578</bug>: Avoid NPE accessing cookies during access logging
+ for request that had no context mapping. (remm)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
