From f99d3f5c8f0d0bf760bb263ae361b9963ce8ad62 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur.signell@itmill.com>
Date: Sun, 1 Feb 2009 13:16:02 +0000
Subject: [PATCH] Fix for #2525 - NPE in WebApplicationContext

svn changeset:6692/svn branch:trunk
---
 .../toolkit/terminal/gwt/server/WebApplicationContext.java | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/com/itmill/toolkit/terminal/gwt/server/WebApplicationContext.java b/src/com/itmill/toolkit/terminal/gwt/server/WebApplicationContext.java
index e0cf13d22d..143811789a 100644
--- a/src/com/itmill/toolkit/terminal/gwt/server/WebApplicationContext.java
+++ b/src/com/itmill/toolkit/terminal/gwt/server/WebApplicationContext.java
@@ -104,11 +104,18 @@ public class WebApplicationContext implements ApplicationContext,
 
     @Override
     public boolean equals(Object obj) {
+        if (session == null) {
+            return false;
+        }
+
         return session.equals(obj);
     }
 
     @Override
     public int hashCode() {
+        if (session == null) {
+            return -1;
+        }
         return session.hashCode();
     }
 
-- 
2.39.5