Repository: wicket
Updated Branches:
  refs/heads/wicket-7.x 61d0b09b9 -> 237a830f4


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/237a830f
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/237a830f
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/237a830f

Branch: refs/heads/wicket-7.x
Commit: 237a830f4f412276cc31b236d46f67cec7498dd8
Parents: 61d0b09
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:56:22 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/237a830f/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 d18a644..691355e 100644
--- a/wicket-core/src/main/java/org/apache/wicket/Session.java
+++ b/wicket-core/src/main/java/org/apache/wicket/Session.java
@@ -502,7 +502,9 @@ public abstract class Session implements IClusterable, 
IEventSink
         */
        public void invalidateNow()
        {
-               invalidate();
+               if (isSessionInvalidated() == false) {
+                       invalidate();
+               }
                destroy();
        }
 

Reply via email to