Author: kkolinko
Date: Sun Jan 31 18:02:54 2016
New Revision: 1727846
URL: http://svn.apache.org/viewvc?rev=1727846&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58817
Ensure that a valid URI (not an empty string) is used with Mapper.map(hostName,
uri) call.
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/MapperListener.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/MapperListener.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/MapperListener.java?rev=1727846&r1=1727845&r2=1727846&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/MapperListener.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/MapperListener.java
Sun Jan 31 18:02:54 2016
@@ -475,10 +475,10 @@ public class MapperListener
// Don't un-map a context that is paused
MessageBytes hostMB = MessageBytes.newInstance();
hostMB.setString(hostName);
- MessageBytes contextMB = MessageBytes.newInstance();
- contextMB.setString(contextName);
+ MessageBytes uriMB = MessageBytes.newInstance();
+ uriMB.setString(contextName.length() > 0 ? contextName : "/");
MappingData mappingData = new MappingData();
- mapper.map(hostMB, contextMB, mappingData);
+ mapper.map(hostMB, uriMB, mappingData);
if (mappingData.context instanceof StandardContext &&
((StandardContext)mappingData.context).getPaused()) {
return;
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1727846&r1=1727845&r2=1727846&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sun Jan 31 18:02:54 2016
@@ -115,6 +115,11 @@
Generate this copy during the ant "compile" task. (kkolinko)
</fix>
<fix>
+ <bug>58817</bug>: Fix <code>ArrayIndexOutOfBoundsException</code>
+ caused by <code>MapperListener</code> when ROOT context is being
+ undeployed and mapperContextRootRedirectEnabled="false". (kkolinko)
+ </fix>
+ <fix>
<bug>58836</bug>: Correctly merge query string parameters when
processing a forwarded request where the target includes a query string
that contains a parameter with no value. (markt/kkolinko)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
