Return-Path: Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: (qmail 40974 invoked from network); 3 Oct 2006 01:08:40 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 3 Oct 2006 01:08:40 -0000 Received: (qmail 92981 invoked by uid 500); 3 Oct 2006 01:08:36 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 92761 invoked by uid 500); 3 Oct 2006 01:08:35 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 92750 invoked by uid 500); 3 Oct 2006 01:08:35 -0000 Delivered-To: apmail-jakarta-tomcat-dev@jakarta.apache.org Received: (qmail 92747 invoked by uid 99); 3 Oct 2006 01:08:35 -0000 Received: from idunn.apache.osuosl.org (HELO idunn.apache.osuosl.org) (140.211.166.84) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Oct 2006 18:08:35 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=5.0 tests=ALL_TRUSTED,NO_REAL_NAME Received: from [140.211.166.113] ([140.211.166.113:62571] helo=eris.apache.org) by idunn.apache.osuosl.org (ecelerity 2.1.1.8 r(12930)) with ESMTP id 0B/22-29668-218B1254 for ; Mon, 02 Oct 2006 18:08:34 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id BC1231A981A; Mon, 2 Oct 2006 18:08:32 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r452288 - /tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardPipeline.java Date: Tue, 03 Oct 2006 01:08:32 -0000 To: tomcat-dev@jakarta.apache.org From: markt@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061003010832.BC1231A981A@eris.apache.org> X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: markt Date: Mon Oct 2 18:08:32 2006 New Revision: 452288 URL: http://svn.apache.org/viewvc?view=rev&rev=452288 Log: 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. Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardPipeline.java Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardPipeline.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardPipeline.java?view=diff&rev=452288&r1=452287&r2=452288 ============================================================================== --- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardPipeline.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardPipeline.java Mon Oct 2 18:08:32 2006 @@ -530,6 +530,8 @@ current = current.getNext(); } + if (first == basic) first = null; + if (valve instanceof Contained) ((Contained) valve).setContainer(null); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org