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

[mgrigorov]

Author: mgrigorov
Date: Sun Jul 25 08:54:20 2010
New Revision: 979004

URL: http://svn.apache.org/viewvc?rev=979004&view=rev
Log:
WICKET-2956 WebApplication.onSessionDestroyed no longer invoked by anybody

Return the correct session attribute prefix if the passed Request is an 
instance of WebRequest.


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

Modified: 
wicket/trunk/wicket/src/main/java/org/apache/wicket/session/HttpSessionStore.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/session/HttpSessionStore.java?rev=979004&r1=979003&r2=979004&view=diff
==============================================================================
--- 
wicket/trunk/wicket/src/main/java/org/apache/wicket/session/HttpSessionStore.java
 (original)
+++ 
wicket/trunk/wicket/src/main/java/org/apache/wicket/session/HttpSessionStore.java
 Sun Jul 25 08:54:20 2010
@@ -32,8 +32,10 @@ import javax.servlet.http.HttpSessionBin
 import org.apache.wicket.Application;
 import org.apache.wicket.Session;
 import org.apache.wicket.protocol.http.IRequestLogger;
+import org.apache.wicket.protocol.http.WebApplication;
 import org.apache.wicket.protocol.http.servlet.ServletWebRequest;
 import org.apache.wicket.request.Request;
+import org.apache.wicket.request.http.WebRequest;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -217,9 +219,15 @@ public class HttpSessionStore implements
         */
        private String getSessionAttributePrefix(final Request request)
        {
-               return "wicket";
-               // TODO:
-               // return application.getSessionAttributePrefix(request);
+               String sessionAttributePrefix = "wicket";
+
+               if (request instanceof WebRequest)
+               {
+                       sessionAttributePrefix = 
WebApplication.get().getSessionAttributePrefix(
+                               (WebRequest)request, null);
+               }
+
+               return sessionAttributePrefix;
        }
 
        /**