Remy's better fix for 43683.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@650648 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/core/StandardContextValve.java b/java/org/apache/catalina/core/StandardContextValve.java
index c473590..cb019ce 100644 (file)
--- a/java/org/apache/catalina/core/StandardContextValve.java
+++ b/java/org/apache/catalina/core/StandardContextValve.java
@@ -140,6 +140,14 @@ final class StandardContextValve
             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