[tomcat] 01/02: Remove unnecessary changes to fix BZ 63836

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 6064cd7bc023f197c039256a2e71e7e3c5cb1982
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Sat Nov 2 12:05:31 2019 +0000

    Remove unnecessary changes to fix BZ 63836
---
 java/org/apache/catalina/startup/ContextConfig.java | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/java/org/apache/catalina/startup/ContextConfig.java 
b/java/org/apache/catalina/startup/ContextConfig.java
index f0f2fd2..8b2446d 100644
--- a/java/org/apache/catalina/startup/ContextConfig.java
+++ b/java/org/apache/catalina/startup/ContextConfig.java
@@ -37,6 +37,7 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Properties;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 
 import javax.servlet.MultipartConfigElement;
 import javax.servlet.ServletContainerInitializer;
@@ -79,7 +80,6 @@ import org.apache.tomcat.util.bcel.classfile.ElementValue;
 import org.apache.tomcat.util.bcel.classfile.ElementValuePair;
 import org.apache.tomcat.util.bcel.classfile.JavaClass;
 import org.apache.tomcat.util.buf.UriUtil;
-import org.apache.tomcat.util.collections.ManagedConcurrentWeakHashMap;
 import org.apache.tomcat.util.descriptor.InputSourceUtil;
 import org.apache.tomcat.util.descriptor.XmlErrorHandler;
 import org.apache.tomcat.util.descriptor.web.ContextEjb;
@@ -163,8 +163,8 @@ public class ContextConfig implements LifecycleListener {
     /**
      * Cache of default web.xml fragments per Host
      */
-    protected static final 
ManagedConcurrentWeakHashMap<Host,DefaultWebXmlCacheEntry> hostWebXmlCache =
-            new ManagedConcurrentWeakHashMap<>();
+    protected static final Map<Host,DefaultWebXmlCacheEntry> hostWebXmlCache =
+            new ConcurrentHashMap<>();
 
 
     /**
@@ -306,8 +306,6 @@ public class ContextConfig implements LifecycleListener {
             if (originalDocBase != null) {
                 context.setDocBase(originalDocBase);
             }
-        } else if (event.getType().equals(Lifecycle.PERIODIC_EVENT)) {
-            hostWebXmlCache.maintain();
         } else if (event.getType().equals(Lifecycle.CONFIGURE_STOP_EVENT)) {
             configureStop();
         } else if (event.getType().equals(Lifecycle.AFTER_INIT_EVENT)) {


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org