Return-Path: Delivered-To: apmail-cocoon-cvs-archive@www.apache.org Received: (qmail 32952 invoked from network); 27 Oct 2007 00:06:22 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 27 Oct 2007 00:06:22 -0000 Received: (qmail 57480 invoked by uid 500); 27 Oct 2007 00:06:09 -0000 Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org Received: (qmail 57424 invoked by uid 500); 27 Oct 2007 00:06:09 -0000 Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@cocoon.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@cocoon.apache.org Received: (qmail 57411 invoked by uid 99); 27 Oct 2007 00:06:09 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 26 Oct 2007 17:06:09 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 27 Oct 2007 00:06:21 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 4D82B1A9832; Fri, 26 Oct 2007 17:06:01 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r588810 - /cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/treeprocessor/ConcreteTreeProcessor.java Date: Sat, 27 Oct 2007 00:06:01 -0000 To: cvs@cocoon.apache.org From: vgritsenko@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071027000601.4D82B1A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: vgritsenko Date: Fri Oct 26 17:06:00 2007 New Revision: 588810 URL: http://svn.apache.org/viewvc?rev=588810&view=rev Log: another finally{} tweak. Modified: cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/treeprocessor/ConcreteTreeProcessor.java Modified: cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/treeprocessor/ConcreteTreeProcessor.java URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/treeprocessor/ConcreteTreeProcessor.java?rev=588810&r1=588809&r2=588810&view=diff ============================================================================== --- cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/treeprocessor/ConcreteTreeProcessor.java (original) +++ cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/components/treeprocessor/ConcreteTreeProcessor.java Fri Oct 26 17:06:00 2007 @@ -225,17 +225,17 @@ } this.sitemapExecutor.enterSitemap(this, environment.getObjectModel(), this.wrappingProcessor.source.getURI()); + // and now process EnvironmentHelper.enterProcessor(this, environment); final Redirector oldRedirector = context.getRedirector(); - - // Build a redirector - TreeProcessorRedirector redirector = new TreeProcessorRedirector(environment, context); - context.setRedirector(redirector); - context.service(this.manager); - context.setLastProcessor(this); - try { + // Build a redirector + TreeProcessorRedirector redirector = new TreeProcessorRedirector(environment, context); + context.setRedirector(redirector); + context.service(this.manager); + context.setLastProcessor(this); + return this.rootNode.invoke(environment, context); } finally { EnvironmentHelper.leaveProcessor();