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/09389368 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/09389368 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/09389368 Branch: refs/heads/master Commit: 093893684984a2fcac04b4330fbacb3a81bac3a2 Parents: c5276ed Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Sun Mar 5 21:56:22 2017 +0100 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Mon Mar 20 21:42:32 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/09389368/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(); }
