greenrd 01/01/23 10:41:08
Modified: . changes.xml
src/org/apache/cocoon Engine.java
Log:
need to deal with producers redirecting also, even though they cannot yet get
the response they might be able to in future
Revision Changes Path
1.193 +2 -2 xml-cocoon/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/xml-cocoon/changes.xml,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -r1.192 -r1.193
--- changes.xml 2001/01/23 18:37:18 1.192
+++ changes.xml 2001/01/23 18:40:59 1.193
@@ -4,7 +4,7 @@
<!--
History of Cocoon changes
- $Id: changes.xml,v 1.192 2001/01/23 18:37:18 greenrd Exp $
+ $Id: changes.xml,v 1.193 2001/01/23 18:40:59 greenrd Exp $
-->
<changes title="History of Changes">
@@ -20,7 +20,7 @@
<release version="@version@" date="@date@">
<action dev="RDG" type="fix">
response.sendRedirect no longer throws an Exception; processing is
instead stopped inside the Cocoon
- Engine for that request, after this processor returns. This is needed to
fix a redirect problem
+ Engine for that request, after this processor/producer returns. This is
needed to fix a redirect problem
with Tomcat (see below).
</action>
<action dev="RDG" type="fix" due-to="Steffen Stundzig"
due-to-email="[EMAIL PROTECTED]">
1.49 +4 -3 xml-cocoon/src/org/apache/cocoon/Engine.java
Index: Engine.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/Engine.java,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- Engine.java 2001/01/23 18:37:27 1.48
+++ Engine.java 2001/01/23 18:41:05 1.49
@@ -1,4 +1,4 @@
-/*-- $Id: Engine.java,v 1.48 2001/01/23 18:37:27 greenrd Exp $ --
+/*-- $Id: Engine.java,v 1.49 2001/01/23 18:41:05 greenrd Exp $ --
============================================================================
The Apache Software License, Version 1.1
@@ -77,7 +77,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Stefano Mazzocchi</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Robin Green</a>
- * @version $Revision: 1.48 $ $Date: 2001/01/23 18:37:27 $
+ * @version $Revision: 1.49 $ $Date: 2001/01/23 18:41:05 $
*/
public class Engine implements Defaults {
@@ -358,6 +358,7 @@
if (PROFILE) profiler.startEvent (requestMarker,
producer.getClass ());
Document document = producer.getDocument(request);
if (PROFILE) profiler.finishEvent (requestMarker,
producer.getClass ());
+ if ((HttpServletResponseFacade)
response).hasRedirected) throw new RedirectException ();
if (LOG) logger.log(this, "Document produced",
Logger.DEBUG);
@@ -381,9 +382,9 @@
String processDesc = processor.getClass
().getName () + "-" + processNum;
if (PROFILE) profiler.startEvent (requestMarker,
processDesc);
document = processor.process(document,
environment);
- if ((HttpServletResponseFacade)
response).hasRedirected) throw new RedirectException ();
page.setChangeable(processor);
if (PROFILE) profiler.finishEvent
(requestMarker, processDesc);
+ if ((HttpServletResponseFacade)
response).hasRedirected) throw new RedirectException ();
if (LOG) logger.log(this, "Document processed",
Logger.DEBUG);
}
