svn commit: r476075 - in /struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher: ActionContextCleanUp.java Dispatcher.java FilterDispatcherCompatWeblogic61.java

[mrdon]

Author: mrdon
Date: Fri Nov 17 00:28:30 2006
New Revision: 476075

URL: http://svn.apache.org/viewvc?view=rev&rev=476075
Log:
Fixed initializing of bean selection twice, resolved inheritance confusion in 
wl compat filter,
cleaned up some logging
WW-1507

Modified:
    
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ActionContextCleanUp.java
    
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
    
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcherCompatWeblogic61.java

Modified: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ActionContextCleanUp.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ActionContextCleanUp.java?view=diff&rev=476075&r1=476074&r2=476075
==============================================================================
--- 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ActionContextCleanUp.java
 (original)
+++ 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ActionContextCleanUp.java
 Fri Nov 17 00:28:30 2006
@@ -93,9 +93,7 @@
                 }
                 request.setAttribute(COUNTER, count);
 
-                if (LOG.isDebugEnabled()) {
-                    LOG.debug("filtering counter="+count);
-                }
+                //LOG.debug("filtering counter="+count);
 
                 chain.doFilter(request, response);
             } finally {
@@ -128,10 +126,6 @@
         // always dontClean up the thread request, even if an action hasn't 
been executed
         ActionContext.setContext(null);
         Dispatcher.setInstance(null);
-
-        if (LOG.isDebugEnabled()) {
-            LOG.debug("clean up ");
-        }
     }
 
     public void destroy() {

Modified: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java?view=diff&rev=476075&r1=476074&r2=476075
==============================================================================
--- 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
 (original)
+++ 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
 Fri Nov 17 00:28:30 2006
@@ -301,7 +301,6 @@
                 provider.setPageLocator(new 
ServletContextPageLocator(servletContext));
                 configurationManager.addConfigurationProvider(provider);
             }
-            configurationManager.addConfigurationProvider(new 
BeanSelectionProvider());
         }
         
         String configProvs = initParams.get("configProviders");

Modified: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcherCompatWeblogic61.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcherCompatWeblogic61.java?view=diff&rev=476075&r1=476074&r2=476075
==============================================================================
--- 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcherCompatWeblogic61.java
 (original)
+++ 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcherCompatWeblogic61.java
 Fri Nov 17 00:28:30 2006
@@ -46,9 +46,7 @@
  * exception as an error.
  *
  */
-public class FilterDispatcherCompatWeblogic61
-        extends FilterDispatcher
-        implements Filter {
+public class FilterDispatcherCompatWeblogic61 extends FilterDispatcher {
 
     private static Log log =
             LogFactory.getLog(FilterDispatcherCompatWeblogic61.class);