WICKET-5402 NullPointerException when logging out with wicket-atmosphere
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/f3c873c7 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/f3c873c7 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/f3c873c7 Branch: refs/heads/sandbox/WICKET-4686 Commit: f3c873c7bc8af199a428c59c072902b29aad8b4b Parents: cfce6a3 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Thu Dec 19 16:36:55 2013 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Thu Dec 19 16:38:31 2013 +0200 ---------------------------------------------------------------------- .../src/main/java/org/apache/wicket/atmosphere/PageKey.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/f3c873c7/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/PageKey.java ---------------------------------------------------------------------- diff --git a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/PageKey.java b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/PageKey.java index 4cedbc9..61586a9 100644 --- a/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/PageKey.java +++ b/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/PageKey.java @@ -63,7 +63,8 @@ public class PageKey */ public boolean isForSession(String sessionId) { - return getSessionId().equals(sessionId); + String sid = getSessionId(); + return sid != null && sid.equals(sessionId); } @Override
