svn commit: r388627 - in /beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow: PageFlowContext.java PageFlowPageFilter.java PageFlowRequestProcessor.java

[ek...@apache.org]

Author: ekoneil
Date: Fri Mar 24 12:34:23 2006
New Revision: 388627

URL: http://svn.apache.org/viewcvs?rev=388627&view=rev
Log:
Remove the use of a PageFlowContext thread local that is *very* useful and needs to come back but is currently leaking ServletRequest, ServletResponse, and ServletContext to threads that aren't used to handle requests to NetUI enabled webapps.

BB: self
Test: NetUI BVT pass


Modified:
    beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowContext.java
    beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowPageFilter.java
    beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowRequestProcessor.java

Modified: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowContext.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowContext.java?rev=388627&r1=388626&r2=388627&view=diff
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowContext.java (original)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowContext.java Fri Mar 24 12:34:23 2006
@@ -13,7 +13,7 @@
  */
 public class PageFlowContext
 {
-    static ThreadLocal pageflowContext = new PageFlowContextThreadLocal();
+    private static ThreadLocal pageflowContext = new PageFlowContextThreadLocal();
 
     // The context will provide access to the Servlet objects
     // @todo: do we want to abstract these further to provide an abstraction removing the Servlet API?
@@ -100,7 +100,7 @@
      * it doesn't exist.
      * @return The object stored by the name.
      */
-    public Object get(String name,PageFlowContextActivator activator)
+    public Object get(String name, PageFlowContextActivator activator)
     {
         assert (name != null) : "Parameter 'name' must not be null";
         assert (activator != null) : "Parameter 'activator' must not be null";

Modified: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowPageFilter.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowPageFilter.java?rev=388627&r1=388626&r2=388627&view=diff
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowPageFilter.java (original)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowPageFilter.java Fri Mar 24 12:34:23 2006
@@ -144,15 +144,6 @@
             long startTime = System.currentTimeMillis();
 
             //
-            // Create the PageFlow Context
-            //
-            PageFlowContext pfCtxt = PageFlowContext.getContext();
-            pfCtxt.init();
-            pfCtxt.setRequest(httpRequest);
-            pfCtxt.setResponse(httpResponse);
-            pfCtxt.setServletContext(_servletContext);
-
-            //
             // Register the default URLRewriter
             //
             URLRewriterService.registerURLRewriter( 0, request, new DefaultURLRewriter() );

Modified: beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowRequestProcessor.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowRequestProcessor.java?rev=388627&r1=388626&r2=388627&view=diff
==============================================================================
--- beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowRequestProcessor.java (original)
+++ beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowRequestProcessor.java Fri Mar 24 12:34:23 2006
@@ -817,15 +817,6 @@
         long startTime = System.currentTimeMillis();
 
         //
-        // Create the PageFlow Context
-        //
-        PageFlowContext pfCtxt = PageFlowContext.getContext();
-        pfCtxt.init();
-        pfCtxt.setRequest(request);
-        pfCtxt.setResponse(response);
-        pfCtxt.setServletContext(servletContext);
-
-        //
         // Register the default URLRewriter
         //
         URLRewriterService.registerURLRewriter( 0, request, new DefaultURLRewriter() );