cziegeler 2004/06/07 01:18:17
Modified: . status.xml
src/java/org/apache/cocoon/environment/wrapper
EnvironmentWrapper.java
Log:
<action dev="CZ" type="fix" fixes-bug="28686">
Correct redirect handling for internal redirects.
</action>
Revision Changes Path
1.353 +4 -1 cocoon-2.1/status.xml
Index: status.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/status.xml,v
retrieving revision 1.352
retrieving revision 1.353
diff -u -r1.352 -r1.353
--- status.xml 5 Jun 2004 08:18:50 -0000 1.352
+++ status.xml 7 Jun 2004 08:18:16 -0000 1.353
@@ -205,6 +205,9 @@
<changes>
<release version="@version@" date="@date@">
+ <action dev="CZ" type="fix" fixes-bug="28686">
+ Correct redirect handling for internal redirects.
+ </action>
<action dev="SW" type="fix" fixes-bug="27249">
Refactor TreeProcessor to avoid constant reloading of sitemap if its
modification
date is in the future and occasional ECM-related exceptions when a
sitemap is
1.19 +2 -2
cocoon-2.1/src/java/org/apache/cocoon/environment/wrapper/EnvironmentWrapper.java
Index: EnvironmentWrapper.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/environment/wrapper/EnvironmentWrapper.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- EnvironmentWrapper.java 26 May 2004 01:31:06 -0000 1.18
+++ EnvironmentWrapper.java 7 Jun 2004 08:18:17 -0000 1.19
@@ -142,7 +142,7 @@
*/
public void redirect(String newURL, boolean global, boolean permanent)
throws IOException {
- if ( !global ) {
+ if ( !global && !this.internalRedirect ) {
this.redirectURL = newURL;
} else {
this.environment.redirect(newURL, global, permanent);
