From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 22 Apr 2008 20:43:50 +0000 (+0000)
Subject: Revert previous patch to fix obvious potential NPE as pointed out by Remy.
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=ef82a2274a6014a51a6cc136c905f8f9b26b8e1c;p=tomcat7.0

Revert previous patch to fix obvious potential NPE as pointed out by Remy.

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

diff --git a/java/org/apache/catalina/core/StandardContextValve.java b/java/org/apache/catalina/core/StandardContextValve.java
index 0b9b10095..c473590a0 100644
--- a/java/org/apache/catalina/core/StandardContextValve.java
+++ b/java/org/apache/catalina/core/StandardContextValve.java
@@ -136,13 +136,6 @@ 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);