svn commit: r556700 - /incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/WicketSessionFilter.java

[ehillenius]

Author: ehillenius
Date: Mon Jul 16 12:18:34 2007
New Revision: 556700

URL: http://svn.apache.org/viewvc?view=rev&rev=556700
Log:
rolled back setting the application thread local. This filter can be improved 
to use the filter name for configuration. Not worth the effort right now, 
especially since it would break clients and no-one complained yet.

Modified:
    
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/WicketSessionFilter.java

Modified: 
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/WicketSessionFilter.java
URL: 
http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/WicketSessionFilter.java?view=diff&rev=556700&r1=556699&r2=556700
==============================================================================
--- 
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/WicketSessionFilter.java
 (original)
+++ 
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/WicketSessionFilter.java
 Mon Jul 16 12:18:34 2007
@@ -27,9 +27,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 
-import org.apache.wicket.Application;
 import org.apache.wicket.Session;
-import org.apache.wicket.protocol.http.WebApplication;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -159,15 +157,6 @@
        public void doFilter(ServletRequest request, ServletResponse response, 
FilterChain chain)
                        throws IOException, ServletException
        {
-               // set application thread local regarless of whether we can 
find a
-               // session
-               WebApplication webApplication = 
(WebApplication)filterConfig.getServletContext()
-                               
.getAttribute(WebApplication.SERVLET_CONTEXT_APPLICATION_KEY);
-               if (webApplication != null)
-               {
-                       Application.set(webApplication);
-               }
-
                HttpServletRequest httpServletRequest = 
((HttpServletRequest)request);
                HttpSession httpSession = httpServletRequest.getSession(false);
                if (httpSession != null)
@@ -208,13 +197,6 @@
 
                // go on with processing
                chain.doFilter(request, response);
-
-               // clean up
-               Session.unset();
-               if (webApplication != null)
-               {
-                       Application.unset();
-               }
        }
 
        /**