Author: markt
Date: Tue Apr 22 13:43:50 2008
New Revision: 650645
URL: http://svn.apache.org/viewvc?rev=650645&view=rev
Log:
Revert previous patch to fix obvious potential NPE as pointed out by Remy.
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardContextValve.java
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContextValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContextValve.java?rev=650645&r1=650644&r2=650645&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardContextValve.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContextValve.java Tue
Apr 22 13:43:50 2008
@@ -136,13 +136,6 @@
// 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);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
