Repository: wicket
Updated Branches:
  refs/heads/master 7729e4d46 -> 21ae5a9fb


WICKET-6317 AuthenticatedWebSession#signOut() calls twice after session 
invalidation

Do not call #invalidate() inside #invalidateNow() if the session is already 
invalidated.


Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/21ae5a9f
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/21ae5a9f
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/21ae5a9f

Branch: refs/heads/master
Commit: 21ae5a9fb26eba66e593bf8566004c9296548001
Parents: 7729e4d
Author: Martin Tzvetanov Grigorov <[email protected]>
Authored: Sun Mar 5 21:56:22 2017 +0100
Committer: Martin Tzvetanov Grigorov <[email protected]>
Committed: Sun Mar 5 21:57:33 2017 +0100

----------------------------------------------------------------------
 wicket-core/src/main/java/org/apache/wicket/Session.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/21ae5a9f/wicket-core/src/main/java/org/apache/wicket/Session.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/Session.java 
b/wicket-core/src/main/java/org/apache/wicket/Session.java
index 2ccbec8..e7f9c14 100644
--- a/wicket-core/src/main/java/org/apache/wicket/Session.java
+++ b/wicket-core/src/main/java/org/apache/wicket/Session.java
@@ -511,7 +511,9 @@ public abstract class Session implements IClusterable, 
IEventSink
         */
        public void invalidateNow()
        {
-               invalidate();
+               if (isSessionInvalidated() == false) {
+                       invalidate();
+               }
                destroy();
        }
 

Reply via email to