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 <[email protected]>
Authored: Fri Apr 26 17:04:32 2013 +0200
Committer: Martin Tzvetanov Grigorov <[email protected]>
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

Reply via email to