Author: markt
Date: Fri Jun 8 16:05:35 2018
New Revision: 1833194
URL: http://svn.apache.org/viewvc?rev=1833194&view=rev
Log:
Reviewing BZ 53085
Remove unnecessary code now Context.getInstanceManager() has been added.
Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java
tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java
Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java?rev=1833194&r1=1833193&r2=1833194&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java Fri
Jun 8 16:05:35 2018
@@ -22,7 +22,6 @@ import java.io.ObjectInputStream;
import java.io.Serializable;
import java.util.Collections;
import java.util.Enumeration;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -38,7 +37,6 @@ import org.apache.catalina.Globals;
import org.apache.catalina.security.SecurityUtil;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
-import org.apache.tomcat.InstanceManager;
import org.apache.tomcat.util.ExceptionUtils;
import org.apache.tomcat.util.descriptor.web.FilterDef;
import org.apache.tomcat.util.log.SystemLogHandler;
@@ -104,7 +102,7 @@ public final class ApplicationFilterConf
getFilter();
} else {
this.filter = filterDef.getFilter();
- getInstanceManager().newInstance(filter);
+ context.getInstanceManager().newInstance(filter);
initFilter();
}
}
@@ -131,11 +129,6 @@ public final class ApplicationFilterConf
private final FilterDef filterDef;
/**
- * the InstanceManager used to create and destroy filter instances.
- */
- private transient InstanceManager instanceManager;
-
- /**
* JMX registration name
*/
private ObjectName oname;
@@ -253,7 +246,7 @@ public final class ApplicationFilterConf
// Identify the class loader we will be using
String filterClass = filterDef.getFilterClass();
- this.filter = (Filter) getInstanceManager().newInstance(filterClass);
+ this.filter = (Filter)
context.getInstanceManager().newInstance(filterClass);
initFilter();
@@ -334,20 +327,6 @@ public final class ApplicationFilterConf
// -------------------------------------------------------- Private Methods
- private InstanceManager getInstanceManager() {
- if (instanceManager == null) {
- if (context instanceof StandardContext) {
- instanceManager = context.getInstanceManager();
- } else {
- instanceManager = new DefaultInstanceManager(null,
- new HashMap<String, Map<String, String>>(),
- context,
- getClass().getClassLoader());
- }
- }
- return instanceManager;
- }
-
private void registerJMX() {
String parentName = context.getName();
if (!parentName.startsWith("/")) {
Modified: tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java?rev=1833194&r1=1833193&r2=1833194&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java Fri Jun 8
16:05:35 2018
@@ -19,9 +19,7 @@ package org.apache.catalina.core;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
import java.util.concurrent.atomic.AtomicBoolean;
import javax.naming.NamingException;
@@ -47,7 +45,6 @@ import org.apache.coyote.AsyncContextCal
import org.apache.coyote.RequestInfo;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
-import org.apache.tomcat.InstanceManager;
import org.apache.tomcat.util.ExceptionUtils;
import org.apache.tomcat.util.buf.UDecoder;
import org.apache.tomcat.util.res.StringManager;
@@ -78,7 +75,6 @@ public class AsyncContextImpl implements
private long timeout = -1;
private AsyncEvent event = null;
private volatile Request request;
- private volatile InstanceManager instanceManager;
public AsyncContextImpl(Request request) {
if (log.isDebugEnabled()) {
@@ -268,8 +264,8 @@ public class AsyncContextImpl implements
check();
T listener = null;
try {
- listener = (T) getInstanceManager().newInstance(clazz.getName(),
- clazz.getClassLoader());
+ listener = (T) context.getInstanceManager().newInstance(
+ clazz.getName(), clazz.getClassLoader());
} catch (ReflectiveOperationException | NamingException e) {
ServletException se = new ServletException(e);
throw se;
@@ -289,7 +285,6 @@ public class AsyncContextImpl implements
dispatch = null;
event = null;
hasOriginalRequestAndResponse = true;
- instanceManager = null;
listeners.clear();
request = null;
clearServletRequestResponse();
@@ -488,20 +483,6 @@ public class AsyncContextImpl implements
}
}
- private InstanceManager getInstanceManager() {
- if (instanceManager == null) {
- if (context instanceof StandardContext) {
- instanceManager = context.getInstanceManager();
- } else {
- instanceManager = new DefaultInstanceManager(null,
- new HashMap<String, Map<String, String>>(),
- context,
- getClass().getClassLoader());
- }
- }
- return instanceManager;
- }
-
private void check() {
if (request == null) {
// AsyncContext has been recycled and should not be being used
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
