You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2006/10/18 03:29:44 UTC
svn commit: r465118 -
/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/
Author: markt
Date: Tue Oct 17 18:29:43 2006
New Revision: 465118
URL: http://svn.apache.org/viewvc?view=rev&rev=465118
Log:
Fix bug 40762. I took the opportunity to remove all redundant code in o.a.c.core as identified by Eclipse.
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/ApplicationContextFacade.java
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/ApplicationDispatcher.java
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/ApplicationFilterChain.java
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/ApplicationFilterConfig.java
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/ApplicationFilterFactory.java
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/NamingContextListener.java
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardContext.java
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardContextValve.java
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardHost.java
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardServer.java
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardWrapperValve.java
Modified: tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/ApplicationContextFacade.java
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/ApplicationContextFacade.java?view=diff&rev=465118&r1=465117&r2=465118
==============================================================================
--- tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/ApplicationContextFacade.java (original)
+++ tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/ApplicationContextFacade.java Tue Oct 17 18:29:43 2006
@@ -365,26 +365,6 @@
/**
* Use reflection to invoke the requested method. Cache the method object
* to speed up the process
- * @param appContext The AppliationContext object on which the method
- * will be invoked
- * @param methodName The method to call.
- * @param params The arguments passed to the called method.
- */
- private Object doPrivileged(ApplicationContext appContext,
- final String methodName,
- final Object[] params) {
- try{
- return invokeMethod(appContext, methodName, params );
- } catch (Throwable t){
- throw new RuntimeException(t.getMessage());
- }
-
- }
-
-
- /**
- * Use reflection to invoke the requested method. Cache the method object
- * to speed up the process
* will be invoked
* @param methodName The method to call.
* @param params The arguments passed to the called method.
Modified: tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/ApplicationDispatcher.java
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/ApplicationDispatcher.java?view=diff&rev=465118&r1=465117&r2=465118
==============================================================================
--- tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/ApplicationDispatcher.java (original)
+++ tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/ApplicationDispatcher.java Tue Oct 17 18:29:43 2006
@@ -518,7 +518,7 @@
// Create a wrapped response to use for this request
// ServletResponse wresponse = null;
- ServletResponse wresponse = wrapResponse();
+ wrapResponse();
// Handle a non-HTTP include
if (!(request instanceof HttpServletRequest) ||
@@ -623,7 +623,6 @@
}
// Initialize local variables we may need
- HttpServletRequest hrequest = (HttpServletRequest) request;
HttpServletResponse hresponse = (HttpServletResponse) response;
Servlet servlet = null;
IOException ioException = null;
Modified: tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/ApplicationFilterChain.java
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/ApplicationFilterChain.java?view=diff&rev=465118&r1=465117&r2=465118
==============================================================================
--- tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/ApplicationFilterChain.java (original)
+++ tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/ApplicationFilterChain.java Tue Oct 17 18:29:43 2006
@@ -204,8 +204,6 @@
if( System.getSecurityManager() != null ) {
final ServletRequest req = request;
final ServletResponse res = response;
- Principal principal =
- ((HttpServletRequest) req).getUserPrincipal();
Object[] args = new Object[]{req, res, this};
SecurityUtil.doAsPrivilege
Modified: tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/ApplicationFilterConfig.java
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/ApplicationFilterConfig.java?view=diff&rev=465118&r1=465117&r2=465118
==============================================================================
--- tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/ApplicationFilterConfig.java (original)
+++ tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/ApplicationFilterConfig.java Tue Oct 17 18:29:43 2006
@@ -202,9 +202,6 @@
else
classLoader = context.getLoader().getClassLoader();
- ClassLoader oldCtxClassLoader =
- Thread.currentThread().getContextClassLoader();
-
// Instantiate a new instance of this filter and return it
Class clazz = classLoader.loadClass(filterClass);
this.filter = (Filter) clazz.newInstance();
@@ -301,7 +298,7 @@
} else {
// Allocate a new filter instance
- Filter filter = getFilter();
+ getFilter();
}
Modified: tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/ApplicationFilterFactory.java
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/ApplicationFilterFactory.java?view=diff&rev=465118&r1=465117&r2=465118
==============================================================================
--- tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/ApplicationFilterFactory.java (original)
+++ tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/ApplicationFilterFactory.java Tue Oct 17 18:29:43 2006
@@ -20,7 +20,6 @@
import javax.servlet.Servlet;
import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpServletRequest;
import org.apache.catalina.Globals;
import org.apache.catalina.Wrapper;
@@ -111,9 +110,6 @@
requestPath = attribute.toString();
}
- HttpServletRequest hreq = null;
- if (request instanceof HttpServletRequest)
- hreq = (HttpServletRequest)request;
// If there is no servlet to execute, return null
if (servlet == null)
return (null);
Modified: tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/NamingContextListener.java
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/NamingContextListener.java?view=diff&rev=465118&r1=465117&r2=465118
==============================================================================
--- tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/NamingContextListener.java (original)
+++ tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/NamingContextListener.java Tue Oct 17 18:29:43 2006
@@ -36,13 +36,11 @@
import org.apache.catalina.ContainerEvent;
import org.apache.catalina.ContainerListener;
import org.apache.catalina.Context;
-import org.apache.catalina.Engine;
import org.apache.catalina.Host;
import org.apache.catalina.Lifecycle;
import org.apache.catalina.LifecycleEvent;
import org.apache.catalina.LifecycleListener;
import org.apache.catalina.Server;
-import org.apache.catalina.Service;
import org.apache.catalina.deploy.ContextEjb;
import org.apache.catalina.deploy.ContextEnvironment;
import org.apache.catalina.deploy.ContextLocalEjb;
@@ -675,8 +673,6 @@
if (path.length() < 1)
path = "/";
Host host = (Host) ((Context)container).getParent();
- Engine engine = (Engine) host.getParent();
- Service service = engine.getService();
name = new ObjectName(domain + ":type=DataSource" +
",path=" + path +
",host=" + host.getName() +
Modified: tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardContext.java
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardContext.java?view=diff&rev=465118&r1=465117&r2=465118
==============================================================================
--- tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardContext.java Tue Oct 17 18:29:43 2006
@@ -4994,7 +4994,7 @@
// Temporary - /admin uses the old names
return name;
}
- ObjectName result=super.preRegister(server,name);
+ super.preRegister(server,name);
return name;
}
Modified: tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardContextValve.java
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardContextValve.java?view=diff&rev=465118&r1=465117&r2=465118
==============================================================================
--- tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardContextValve.java (original)
+++ tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardContextValve.java Tue Oct 17 18:29:43 2006
@@ -33,8 +33,6 @@
import org.apache.catalina.connector.Response;
import org.apache.catalina.util.StringManager;
import org.apache.catalina.valves.ValveBase;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.tomcat.util.buf.MessageBytes;
/**
@@ -69,9 +67,6 @@
StringManager.getManager(Constants.Package);
- private static Log log = LogFactory.getLog(StandardContextValve.class);
-
-
private StandardContext context = null;
Modified: tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardHost.java
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardHost.java?view=diff&rev=465118&r1=465117&r2=465118
==============================================================================
--- tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardHost.java (original)
+++ tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardHost.java Tue Oct 17 18:29:43 2006
@@ -139,12 +139,6 @@
/**
- * The live deploy flag for this Host.
- */
- private boolean liveDeploy = true;
-
-
- /**
* Unpack WARs property.
*/
private boolean unpackWARs = true;
Modified: tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardServer.java
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardServer.java?view=diff&rev=465118&r1=465117&r2=465118
==============================================================================
--- tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardServer.java (original)
+++ tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardServer.java Tue Oct 17 18:29:43 2006
@@ -63,16 +63,6 @@
private static Log log = LogFactory.getLog(StandardServer.class);
- // -------------------------------------------------------------- Constants
-
-
- /**
- * ServerLifecycleListener classname.
- */
- private static String SERVER_LISTENER_CLASS_NAME =
- "org.apache.catalina.mbeans.ServerLifecycleListener";
-
-
// ------------------------------------------------------------ Constructor
Modified: tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardWrapperValve.java
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardWrapperValve.java?view=diff&rev=465118&r1=465117&r2=465118
==============================================================================
--- tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardWrapperValve.java (original)
+++ tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/StandardWrapperValve.java Tue Oct 17 18:29:43 2006
@@ -34,8 +34,6 @@
import org.apache.catalina.connector.Response;
import org.apache.catalina.util.StringManager;
import org.apache.catalina.valves.ValveBase;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.tomcat.util.buf.MessageBytes;
import org.apache.tomcat.util.log.SystemLogHandler;
@@ -49,8 +47,6 @@
final class StandardWrapperValve
extends ValveBase {
-
- private static Log log = LogFactory.getLog(StandardWrapperValve.class);
// ----------------------------------------------------- Instance Variables
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org