From ef82a2274a6014a51a6cc136c905f8f9b26b8e1c Mon Sep 17 00:00:00 2001 From: markt Date: Tue, 22 Apr 2008 20:43:50 +0000 Subject: [PATCH] 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 --- java/org/apache/catalina/core/StandardContextValve.java | 7 ------- 1 file changed, 7 deletions(-) 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); -- 2.11.0