From 31a35474483e4c00864c58e082dae8c10a90f0de Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 3 Oct 2006 01:08:32 +0000
Subject: [PATCH] Port fix for bug 39724. Removing the only valve from a
 pipeline did not return the pipeline to its original state. Patched provided
 by David Gagnon.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@452288 13f79535-47bb-0310-9956-ffa450edef68
---
 java/org/apache/catalina/core/StandardPipeline.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/java/org/apache/catalina/core/StandardPipeline.java b/java/org/apache/catalina/core/StandardPipeline.java
index 3d79ecb78..c953d1e57 100644
--- 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);
 
-- 
2.11.0