svn commit: r1071270 - /wicket/trunk/wicket-core/src/main/java/org/apache/wicket/session/HttpSessionStore.java

[mgrigorov]

Author: mgrigorov
Date: Wed Feb 16 14:42:54 2011
New Revision: 1071270

URL: http://svn.apache.org/viewvc?rev=1071270&view=rev
Log:
WICKET-3298  Session may not be replicated if the response page has not be 
modified

The new flushSession() method showed a hidden bug - the http session may be 
'null'.


Modified:
    
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/session/HttpSessionStore.java

Modified: 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/session/HttpSessionStore.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/session/HttpSessionStore.java?rev=1071270&r1=1071269&r2=1071270&view=diff
==============================================================================
--- 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/session/HttpSessionStore.java
 (original)
+++ 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/session/HttpSessionStore.java
 Wed Feb 16 14:42:54 2011
@@ -113,13 +113,16 @@ public class HttpSessionStore implements
 
                        HttpSession httpSession = getHttpSession(request, 
false);
 
-                       // register an unbinding listener for cleaning up
-                       String applicationKey = Application.get().getName();
-                       
httpSession.setAttribute("Wicket:SessionUnbindingListener-" + applicationKey,
-                               new SessionBindingListener(applicationKey, 
httpSession.getId()));
+                       if (httpSession != null)
+                       {
+                               // register an unbinding listener for cleaning 
up
+                               String applicationKey = 
Application.get().getName();
+                               
httpSession.setAttribute("Wicket:SessionUnbindingListener-" + applicationKey,
+                                       new 
SessionBindingListener(applicationKey, httpSession.getId()));
 
-                       // register the session object itself
-                       setAttribute(request, getSessionAttribute(), 
newSession);
+                               // register the session object itself
+                               setAttribute(request, getSessionAttribute(), 
newSession);
+                       }
                }
        }