tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r652586 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/core/StandardContextValve.java webapps/docs/changelog.xml
Date Thu, 01 May 2008 17:30:53 GMT
Author: markt
Date: Thu May  1 10:30:53 2008
New Revision: 652586

URL: http://svn.apache.org/viewvc?rev=652586&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43683
Prevent 404 during reloading.
If servlet is no longer present after re-load, a 404 is returned which will be consistent
with subsequent requests.

Modified:
    tomcat/tc6.0.x/trunk/STATUS.txt
    tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContextValve.java
    tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=652586&r1=652585&r2=652586&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu May  1 10:30:53 2008
@@ -76,13 +76,6 @@
   +1: fhanik, markt
   -1: 
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43683
-  Need to identify new wrapper for queued request after reload
-  http://svn.apache.org/viewvc?rev=650648&view=rev
-  +1: markt, remm
-  +1: fhanik - is this 404? shouldn't it send UNAVAILABLE?
-  -1:
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43656
   coerceToType() modifies some values. Patch provided by Nils Eckert
   http://svn.apache.org/viewvc?rev=649638&view=rev

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContextValve.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContextValve.java?rev=652586&r1=652585&r2=652586&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContextValve.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContextValve.java Thu May 
1 10:30:53 2008
@@ -140,6 +140,14 @@
             String requestURI = request.getDecodedRequestURI();
             notFound(requestURI, response);
             return;
+        } else if (wrapper.isUnavailable()) {
+            // May be as a result of a reload, try and find the new wrapper
+            wrapper = (Wrapper) container.findChild(wrapper.getName());
+            if (wrapper == null) {
+                String requestURI = request.getDecodedRequestURI();
+                notFound(requestURI, response);
+                return;
+            }
         }
 
         // Normal request processing

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=652586&r1=652585&r2=652586&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu May  1 10:30:53 2008
@@ -35,6 +35,10 @@
 <section name="Tomcat 6.0.17 (remm)">
   <subsection name="Catalina">
     <changelog>
+      <fix>
+        <bug>43683</bug>: Fix 404 that could occur if a Servlet is accessed
+        while the context is reloading. (markt)
+      </fix>
       <fix>ExtendedAccessLogValve cs-uri not print empty querystring (pero)
       </fix>
       <update>



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


Mime
View raw message