Updated Branches: refs/heads/wicket-1.5.x e2a5dda1b -> 270c57d0c
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/270c57d0 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/270c57d0 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/270c57d0 Branch: refs/heads/wicket-1.5.x Commit: 270c57d0cf1619f06b3514cec7114ab58e1954a2 Parents: e2a2ba5 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:27:02 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/270c57d0/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 30c49ba..44e2a9c 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 @@ -438,8 +438,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) {
