You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by eh...@apache.org on 2007/03/30 05:35:03 UTC
svn commit: r523921 - in
/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket:
PageMap.java markup/html/pages/BrowserInfoPage.java
request/target/basic/RedirectRequestTarget.java
Author: ehillenius
Date: Thu Mar 29 20:35:02 2007
New Revision: 523921
URL: http://svn.apache.org/viewvc?view=rev&rev=523921
Log:
tweaks for redirecting
Modified:
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/PageMap.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/markup/html/pages/BrowserInfoPage.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/request/target/basic/RedirectRequestTarget.java
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/PageMap.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/PageMap.java?view=diff&rev=523921&r1=523920&r2=523921
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/PageMap.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/PageMap.java Thu Mar 29 20:35:02 2007
@@ -20,6 +20,7 @@
import java.util.Iterator;
import java.util.List;
+import wicket.request.target.basic.RedirectRequestTarget;
import wicket.session.pagemap.IPageMapEntry;
import wicket.util.lang.Objects;
@@ -172,21 +173,7 @@
// If there's a place to go to
if (interceptContinuationURL != null)
{
- cycle.setRequestTarget(new IRequestTarget()
- {
- final String responseUrl = interceptContinuationURL;
-
- public void detach(RequestCycle requestCycle)
- {
- }
-
- public void respond(RequestCycle requestCycle)
- {
- // Redirect there
- cycle.getResponse().redirect(responseUrl);
- }
-
- });
+ cycle.setRequestTarget(new RedirectRequestTarget(interceptContinuationURL));
// Reset interception URL
interceptContinuationURL = null;
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/markup/html/pages/BrowserInfoPage.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/markup/html/pages/BrowserInfoPage.java?view=diff&rev=523921&r1=523920&r2=523921
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/markup/html/pages/BrowserInfoPage.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/markup/html/pages/BrowserInfoPage.java Thu Mar 29 20:35:02 2007
@@ -25,6 +25,7 @@
import wicket.IClusterable;
import wicket.PageParameters;
import wicket.RequestCycle;
+import wicket.Response;
import wicket.markup.html.WebComponent;
import wicket.markup.html.WebMarkupContainer;
import wicket.markup.html.WebPage;
@@ -595,7 +596,9 @@
// want a second redirect to occur automatically
requestCycle.setRedirect(false);
// Redirect there
- requestCycle.getResponse().redirect(continueTo);
+ Response response = requestCycle.getResponse();
+ response.reset();
+ response.redirect(continueTo);
}
/**
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/request/target/basic/RedirectRequestTarget.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/request/target/basic/RedirectRequestTarget.java?view=diff&rev=523921&r1=523920&r2=523921
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/request/target/basic/RedirectRequestTarget.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/request/target/basic/RedirectRequestTarget.java Thu Mar 29 20:35:02 2007
@@ -18,6 +18,7 @@
import wicket.IRequestTarget;
import wicket.RequestCycle;
+import wicket.Response;
import wicket.markup.html.pages.RedirectPage;
/**
@@ -57,7 +58,9 @@
*/
public void respond(RequestCycle requestCycle)
{
- requestCycle.getResponse().redirect(redirectUrl);
+ Response response = requestCycle.getResponse();
+ response.reset();
+ response.redirect(redirectUrl);
}
}