Updated Branches:
  refs/heads/master dfcafea9f -> 635ced5e2

WICKET-5049 Wicket Session may be null in SessionBindingListener after 
deserialization


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

Branch: refs/heads/master
Commit: 635ced5e298348e52851a71379f7bc9562bb5c1c
Parents: dfcafea
Author: Martin Tzvetanov Grigorov <[email protected]>
Authored: Thu Feb 21 14:21:53 2013 +0200
Committer: Martin Tzvetanov Grigorov <[email protected]>
Committed: Thu Feb 21 14:21:53 2013 +0200

----------------------------------------------------------------------
 .../apache/wicket/session/HttpSessionStore.java    |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/635ced5e/wicket-core/src/main/java/org/apache/wicket/session/HttpSessionStore.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/main/java/org/apache/wicket/session/HttpSessionStore.java 
b/wicket-core/src/main/java/org/apache/wicket/session/HttpSessionStore.java
index c2631cf..3b0426b 100644
--- a/wicket-core/src/main/java/org/apache/wicket/session/HttpSessionStore.java
+++ b/wicket-core/src/main/java/org/apache/wicket/session/HttpSessionStore.java
@@ -466,8 +466,11 @@ public class HttpSessionStore implements ISessionStore
 
                        log.debug("Session unbound: {}", sessionId);
 
-                       wicketSession.onInvalidate();
-
+                       if (wicketSession != null)
+                       {
+                               wicketSession.onInvalidate();
+                       }
+                       
                        Application application = 
Application.get(applicationKey);
                        if (application == null)
                        {

Reply via email to