Return-Path: X-Original-To: apmail-wicket-commits-archive@www.apache.org Delivered-To: apmail-wicket-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A397D10545 for ; Fri, 26 Apr 2013 15:05:13 +0000 (UTC) Received: (qmail 33496 invoked by uid 500); 26 Apr 2013 15:05:12 -0000 Delivered-To: apmail-wicket-commits-archive@wicket.apache.org Received: (qmail 33462 invoked by uid 500); 26 Apr 2013 15:05:12 -0000 Mailing-List: contact commits-help@wicket.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@wicket.apache.org Delivered-To: mailing list commits@wicket.apache.org Received: (qmail 33403 invoked by uid 99); 26 Apr 2013 15:05:12 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 26 Apr 2013 15:05:12 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 4779E881F22; Fri, 26 Apr 2013 15:05:12 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mgrigorov@apache.org To: commits@wicket.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: WICKET-5140 InterceptData never gets cleared from session after continueToOriginalDestination is called and another page is requested afterwards Date: Fri, 26 Apr 2013 15:05:12 +0000 (UTC) Updated Branches: refs/heads/master 43c7b2f16 -> 5a316d37b 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/5a316d37 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/5a316d37 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/5a316d37 Branch: refs/heads/master Commit: 5a316d37b1042a923f240fafc0fc7f21711fd9ee Parents: 43c7b2f Author: Martin Tzvetanov Grigorov Authored: Fri Apr 26 17:04:32 2013 +0200 Committer: Martin Tzvetanov Grigorov Committed: Fri Apr 26 17:04:32 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/5a316d37/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 99b8ff9..b56949d 100644 --- a/wicket-core/src/main/java/org/apache/wicket/Component.java +++ b/wicket-core/src/main/java/org/apache/wicket/Component.java @@ -1082,6 +1082,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/5a316d37/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 def29ba..7af800e 100644 --- a/wicket-core/src/main/java/org/apache/wicket/RestartResponseAtInterceptPageException.java +++ b/wicket-core/src/main/java/org/apache/wicket/RestartResponseAtInterceptPageException.java @@ -175,6 +175,11 @@ public class RestartResponseAtInterceptPageException extends ResetResponseExcept } } + static void clearOriginalDestination() + { + InterceptData.clear(); + } + static IRequestMapper MAPPER = new IRequestMapper() { @Override