You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2017/12/30 22:16:34 UTC

wicket git commit: WICKET-6441 MockSessionStore doesn't call onInvalidate() on invalidate()

Repository: wicket
Updated Branches:
  refs/heads/master 54f4db03a -> 5cabbb68e


WICKET-6441 MockSessionStore doesn't call onInvalidate() on invalidate()


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

Branch: refs/heads/master
Commit: 5cabbb68effd82e7d195d39c16e3e700d53eb9cc
Parents: 54f4db0
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Sun Dec 31 00:15:53 2017 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Sun Dec 31 00:15:53 2017 +0200

----------------------------------------------------------------------
 .../java/org/apache/wicket/mock/MockSessionStore.java   | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/5cabbb68/wicket-core/src/main/java/org/apache/wicket/mock/MockSessionStore.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/mock/MockSessionStore.java b/wicket-core/src/main/java/org/apache/wicket/mock/MockSessionStore.java
index 3975fae..d0fd08e 100644
--- a/wicket-core/src/main/java/org/apache/wicket/mock/MockSessionStore.java
+++ b/wicket-core/src/main/java/org/apache/wicket/mock/MockSessionStore.java
@@ -45,9 +45,9 @@ public class MockSessionStore implements ISessionStore
 	}
 
 	private String sessionId;
-	private final Map<String, Serializable> attributes = new HashMap<String, Serializable>();
-	private final Set<UnboundListener> unboundListeners = new CopyOnWriteArraySet<UnboundListener>();
-	private final Set<BindListener> bindListeners = new CopyOnWriteArraySet<BindListener>();
+	private final Map<String, Serializable> attributes = new HashMap<>();
+	private final Set<UnboundListener> unboundListeners = new CopyOnWriteArraySet<>();
+	private final Set<BindListener> bindListeners = new CopyOnWriteArraySet<>();
 
 	private Session session;
 
@@ -72,7 +72,7 @@ public class MockSessionStore implements ISessionStore
 	@Override
 	public List<String> getAttributeNames(Request request)
 	{
-		return Collections.unmodifiableList(new ArrayList<String>(attributes.keySet()));
+		return Collections.unmodifiableList(new ArrayList<>(attributes.keySet()));
 	}
 
 	@Override
@@ -96,6 +96,10 @@ public class MockSessionStore implements ISessionStore
 	public void invalidate(Request request)
 	{
 		String sessId = sessionId;
+		if (session != null)
+		{
+			session.onInvalidate();
+		}
 		cleanup();
 		for (UnboundListener l : unboundListeners)
 		{