From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 17 Apr 2008 22:07:38 +0000 (+0000)
Subject: Patch for bug 43683. It could be more efficient if wrapper.started was visible but... 
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=ecdcb5b3071f444b2db51b34a19a605098f5a12c;p=tomcat7.0

Patch for bug 43683. It could be more efficient if wrapper.started was visible but that would have made the patch quite invasive.

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

diff --git a/java/org/apache/catalina/core/StandardContextValve.java b/java/org/apache/catalina/core/StandardContextValve.java
index c473590a0..0b9b10095 100644
--- a/java/org/apache/catalina/core/StandardContextValve.java
+++ b/java/org/apache/catalina/core/StandardContextValve.java
@@ -136,6 +136,13 @@ final class StandardContextValve
 
         // Select the Wrapper to be used for this Request
         Wrapper wrapper = request.getWrapper();
+
+        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);