svn commit: r1484654 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/http/mapper/Mapper.java webapps/docs/changelog.xml

[violetagg]

Author: violetagg
Date: Tue May 21 03:52:02 2013
New Revision: 1484654

URL: http://svn.apache.org/r1484654
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54955
Merged revision 1484592 from tomcat/trunk:
During reloading the application, the context root Wrapper is not removed 
correctly. This causes 404 to be returned later on when the context root is 
requested.

Modified:
    tomcat/tc7.0.x/trunk/   (props changed)
    tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/mapper/Mapper.java
    tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
  Merged /tomcat/trunk:r1484592

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/mapper/Mapper.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/mapper/Mapper.java?rev=1484654&r1=1484653&r2=1484654&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/mapper/Mapper.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/mapper/Mapper.java 
Tue May 21 03:52:02 2013
@@ -501,7 +501,14 @@ public final class Mapper {
                 context.defaultWrapper = null;
             } else {
                 // Exact wrapper
-                String name = path;
+                String name;
+                if (path.length() == 0) {
+                    // Special case for the Context Root mapping which is
+                    // treated as an exact match
+                    name = "/";
+                } else {
+                    name = path;
+                }
                 Wrapper[] oldWrappers = context.exactWrappers;
                 if (oldWrappers.length == 0) {
                     return;

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=1484654&r1=1484653&r2=1484654&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue May 21 03:52:02 2013
@@ -75,6 +75,11 @@
         values for copyXML, deployXML and unpackWARs. (markt)
       </fix>
       <fix>
+        <bug>54955</bug>: When a reload of the application is performed ensure
+        that a subsequent request to the context root does not result in a 404
+        response. (violetagg)
+      </fix>
+      <fix>
         <bug>54974</bug>: Ensure that 
         <code>SessionCookieConfig#set&lt;methods&gt;</code>
         will throw <code>IllegalStateException</code> if the



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org