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/05/31 19:49:31 UTC
wicket git commit: WICKET-6388 MockServletContext should should
define non-null session tracking modes
Repository: wicket
Updated Branches:
refs/heads/master 3d9ba812d -> f556d31b1
WICKET-6388 MockServletContext should should define non-null session tracking modes
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/f556d31b
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/f556d31b
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/f556d31b
Branch: refs/heads/master
Commit: f556d31b1799b1877ddf3a8c8ed322662c943861
Parents: 3d9ba81
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed May 31 21:49:15 2017 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed May 31 21:49:15 2017 +0200
----------------------------------------------------------------------
.../apache/wicket/protocol/http/mock/MockServletContext.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/f556d31b/wicket-core/src/main/java/org/apache/wicket/protocol/http/mock/MockServletContext.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/http/mock/MockServletContext.java b/wicket-core/src/main/java/org/apache/wicket/protocol/http/mock/MockServletContext.java
index fd00487..ce3bae0 100755
--- a/wicket-core/src/main/java/org/apache/wicket/protocol/http/mock/MockServletContext.java
+++ b/wicket-core/src/main/java/org/apache/wicket/protocol/http/mock/MockServletContext.java
@@ -29,6 +29,7 @@ import java.net.URL;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
+import java.util.EnumSet;
import java.util.Enumeration;
import java.util.EventListener;
import java.util.HashMap;
@@ -660,13 +661,13 @@ public class MockServletContext implements ServletContext
@Override
public Set<SessionTrackingMode> getDefaultSessionTrackingModes()
{
- return null;
+ return EnumSet.of(SessionTrackingMode.COOKIE);
}
@Override
public Set<SessionTrackingMode> getEffectiveSessionTrackingModes()
{
- return null;
+ return getDefaultSessionTrackingModes();
}
@Override