You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2004/08/17 13:45:57 UTC
svn commit: rev 36515 - in cocoon/branches/BRANCH_2_1_X: . src/java/org/apache/cocoon/components/treeprocessor
Author: cziegeler
Date: Tue Aug 17 04:45:55 2004
New Revision: 36515
Modified:
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/treeprocessor/TreeProcessor.java
cocoon/branches/BRANCH_2_1_X/status.xml
Log:
Fix bug in redirecting when called from flow
Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/treeprocessor/TreeProcessor.java
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/treeprocessor/TreeProcessor.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/treeprocessor/TreeProcessor.java Tue Aug 17 04:45:55 2004
@@ -60,7 +60,7 @@
* Interpreted tree-traversal implementation of a pipeline assembly language.
*
* @author <a href="mailto:sylvain@apache.org">Sylvain Wallez</a>
- * @version CVS $Id: TreeProcessor.java,v 1.26 2004/05/05 06:36:58 cziegeler Exp $
+ * @version CVS $Id$
*/
public class TreeProcessor
@@ -383,7 +383,12 @@
// Process the redirect
// No more reset since with TreeProcessorRedirector, we need to pop values from the redirect location
// context.reset();
- return processor.process(newEnv, context);
+ // The following is a fix for bug #26854 and #26571
+ final boolean result = processor.process(newEnv, context);
+ if ( ((ForwardEnvironmentWrapper)newEnv).getRedirectURL() != null ) {
+ environment.redirect( false, ((ForwardEnvironmentWrapper)newEnv).getRedirectURL() );
+ }
+ return result;
}
/**
Modified: cocoon/branches/BRANCH_2_1_X/status.xml
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/status.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/status.xml Tue Aug 17 04:45:55 2004
@@ -203,6 +203,9 @@
<changes>
<release version="@version@" date="@date@">
+ <action dev="CZ" type="fix" fixes-bug="26854">
+ A redirect is now possible, if it's called from flow. This also fixes bug #26571.
+ </action>
<action dev="CZ" type="add" fixes-bug="30688" due-to="John Lianoglou" due-to-email="john@arachnedesign.net">
Mail block: Add ability to specify mime-type for email body text parameter in the mail transformer.
</action>