Author: remm
Date: Thu Mar 31 19:16:19 2016
New Revision: 1737276
URL: http://svn.apache.org/viewvc?rev=1737276&view=rev
Log:
59255: Fix posible NPE in mapper, using Konstantin Kolinko's idea.
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/mapper/Mapper.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/mapper/Mapper.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/mapper/Mapper.java?rev=1737276&r1=1737275&r2=1737276&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/mapper/Mapper.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/mapper/Mapper.java Thu Mar 31
19:16:19 2016
@@ -877,7 +877,7 @@ public final class Mapper {
}
if(mappingData.wrapper == null && noServletPath &&
- mappingData.context.getMapperContextRootRedirectEnabled()) {
+ contextVersion.object.getMapperContextRootRedirectEnabled()) {
// The path is empty, redirect to "/"
path.append('/');
pathEnd = path.getEnd();
@@ -1005,7 +1005,7 @@ public final class Mapper {
file = contextVersion.resources.getResource(pathStr);
}
if (file != null && file.isDirectory() &&
-
mappingData.context.getMapperDirectoryRedirectEnabled()) {
+
contextVersion.object.getMapperDirectoryRedirectEnabled()) {
// Note: this mutates the path: do not do any processing
// after this (since we set the redirectPath, there
// shouldn't be any)
Modified: tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml?rev=1737276&r1=1737275&r2=1737276&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Thu Mar 31 19:16:19 2016
@@ -74,6 +74,9 @@
and <code>javax.servlet.AsyncEvent.getSuppliedResponse</code>
(violetagg)
</fix>
+ <fix>
+ <bug>59255</bug>: Fix posible NPE in mapper. (kkolinko/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
