Return-Path: Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org Received: (qmail 12430 invoked by uid 500); 28 Jul 2003 18:09:49 -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: Delivered-To: mailing list cvs@cocoon.apache.org Received: (qmail 12414 invoked by uid 500); 28 Jul 2003 18:09:49 -0000 Delivered-To: apmail-cocoon-2.1-cvs@apache.org Received: (qmail 12409 invoked from network); 28 Jul 2003 18:09:48 -0000 Received: from icarus.apache.org (208.185.179.13) by daedalus.apache.org with SMTP; 28 Jul 2003 18:09:48 -0000 Received: (qmail 54238 invoked by uid 1260); 28 Jul 2003 18:09:48 -0000 Date: 28 Jul 2003 18:09:48 -0000 Message-ID: <20030728180948.54237.qmail@icarus.apache.org> From: cziegeler@apache.org To: cocoon-2.1-cvs@apache.org Subject: cvs commit: cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor TreeProcessor.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N cziegeler 2003/07/28 11:09:48 Modified: src/java/org/apache/cocoon/components/treeprocessor TreeProcessor.java Log: It's that easy...removed unnecessary environment handling for internal calls and finally fixed wrong sitemap manager Revision Changes Path 1.9 +2 -4 cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/TreeProcessor.java Index: TreeProcessor.java =================================================================== RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/TreeProcessor.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- TreeProcessor.java 28 Jul 2003 17:50:41 -0000 1.8 +++ TreeProcessor.java 28 Jul 2003 18:09:48 -0000 1.9 @@ -323,7 +323,7 @@ } // and now process - CocoonComponentManager.enterEnvironment(environment, this.manager, this); + CocoonComponentManager.enterEnvironment(environment, this.sitemapComponentManager, this); try { return this.rootNode.invoke(environment, context); } finally { @@ -342,7 +342,6 @@ context.enableLogging(getLogger()); - CocoonComponentManager.enterEnvironment(environment, this.manager, this); try { if ( process(environment, context) ) { return context.getProcessingPipeline(); @@ -350,7 +349,6 @@ return null; } } finally { - CocoonComponentManager.leaveEnvironment(); context.dispose(); } }