Port fix for bug 39724. Removing the only valve from a pipeline did not return the...

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

diff --git a/java/org/apache/catalina/core/StandardPipeline.java b/java/org/apache/catalina/core/StandardPipeline.java
index 3d79ecb..c953d1e 100644 (file)
--- a/java/org/apache/catalina/core/StandardPipeline.java
+++ b/java/org/apache/catalina/core/StandardPipeline.java
@@ -530,6 +530,8 @@ public class StandardPipeline
             current = current.getNext();
         }
 
+        if (first == basic) first = null;
+
         if (valve instanceof Contained)
             ((Contained) valve).setContainer(null);