From 22bfa64500231f8ea646bb0a15d04290acb2a1d6 Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 22 Apr 2008 20:46:26 +0000
Subject: [PATCH] Remy's better fix for 43683.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@650648 13f79535-47bb-0310-9956-ffa450edef68
---
 java/org/apache/catalina/core/StandardContextValve.java | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/java/org/apache/catalina/core/StandardContextValve.java b/java/org/apache/catalina/core/StandardContextValve.java
index c473590a0..cb019cee7 100644
--- 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
-- 
2.11.0