Fix for #2525 - NPE in WebApplicationContext

svn changeset:6692/svn branch:trunk

diff --git a/src/com/itmill/toolkit/terminal/gwt/server/WebApplicationContext.java b/src/com/itmill/toolkit/terminal/gwt/server/WebApplicationContext.java
index e0cf13d22df015340d406763af3b7ed0127b3fe8..143811789a1b7e001fd2dd7c8c50cd2c7e9a6ee4 100644 (file)
--- 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();
     }