You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by vi...@apache.org on 2013/05/20 22:51:03 UTC

svn commit: r1484592 - /tomcat/trunk/java/org/apache/catalina/mapper/Mapper.java

Author: violetagg
Date: Mon May 20 20:51:02 2013
New Revision: 1484592

URL: http://svn.apache.org/r1484592
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54955
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/trunk/java/org/apache/catalina/mapper/Mapper.java

Modified: tomcat/trunk/java/org/apache/catalina/mapper/Mapper.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mapper/Mapper.java?rev=1484592&r1=1484591&r2=1484592&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/mapper/Mapper.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mapper/Mapper.java Mon May 20 20:51:02 2013
@@ -483,7 +483,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;
+                }
                 MappedWrapper[] oldWrappers = context.exactWrappers;
                 if (oldWrappers.length == 0) {
                     return;



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