Updated Branches: refs/heads/wicket-1.5.x 603db1a9a -> 0b8761f5a
WICKET-5140 InterceptData never gets cleared from session after continueToOriginalDestination is called and another page is requested afterwards Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/0b8761f5 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/0b8761f5 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/0b8761f5 Branch: refs/heads/wicket-1.5.x Commit: 0b8761f5a2eec516fbd4961ba9ae09584493fca9 Parents: 603db1a Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Fri Apr 26 17:04:32 2013 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Fri Apr 26 17:06:25 2013 +0200 ---------------------------------------------------------------------- .../src/main/java/org/apache/wicket/Component.java | 8 ++++++++ .../RestartResponseAtInterceptPageException.java | 5 +++++ 2 files changed, 13 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/0b8761f5/wicket-core/src/main/java/org/apache/wicket/Component.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/Component.java b/wicket-core/src/main/java/org/apache/wicket/Component.java index 0e78d83..a9d50cb 100644 --- a/wicket-core/src/main/java/org/apache/wicket/Component.java +++ b/wicket-core/src/main/java/org/apache/wicket/Component.java @@ -1131,6 +1131,14 @@ public abstract class Component } /** + * Clears any data about previously intercepted page. + */ + public final void clearOriginalDestination() + { + RestartResponseAtInterceptPageException.clearOriginalDestination(); + } + + /** * Registers a debug feedback message for this component * * @param message http://git-wip-us.apache.org/repos/asf/wicket/blob/0b8761f5/wicket-core/src/main/java/org/apache/wicket/RestartResponseAtInterceptPageException.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/RestartResponseAtInterceptPageException.java b/wicket-core/src/main/java/org/apache/wicket/RestartResponseAtInterceptPageException.java index 89be577..1a23e47 100644 --- a/wicket-core/src/main/java/org/apache/wicket/RestartResponseAtInterceptPageException.java +++ b/wicket-core/src/main/java/org/apache/wicket/RestartResponseAtInterceptPageException.java @@ -173,6 +173,11 @@ public class RestartResponseAtInterceptPageException extends ResetResponseExcept return false; } + static void clearOriginalDestination() + { + InterceptData.clear(); + } + static IRequestMapper MAPPER = new IRequestMapper() { public int getCompatibilityScore(Request request)
