Author: markt
Date: Fri May 20 19:36:24 2016
New Revision: 1744790
URL: http://svn.apache.org/viewvc?rev=1744790&view=rev
Log:
Remove the ResourceBundle memory leak protection since I am as sure as I can be
that the original report was a false positive. The reasons I think this are:
- The GC roots related to ResourceBundle were all weak references.
- I can no longer produce the leak with the same (newer version) test
application and Java the original 1.7. If it was a GC bug it is fixed in any
version of Java that Tomcat 8.5 will use.
- We have a better understanding of JVM bugs that make some GC roots not
visible in profilers like YourKit.
Modified:
tomcat/tc8.5.x/trunk/ (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
Propchange: tomcat/tc8.5.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May 20 19:36:24 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501,1741677
,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760
+/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501,1741677
,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java?rev=1744790&r1=1744789&r2=1744790&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
Fri May 20 19:36:24 2016
@@ -23,7 +23,6 @@ import java.io.InputStream;
import java.lang.instrument.ClassFileTransformer;
import java.lang.instrument.IllegalClassFormatException;
import java.lang.ref.Reference;
-import java.lang.ref.WeakReference;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.net.URI;
@@ -52,8 +51,6 @@ import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
-import java.util.ResourceBundle;
-import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.ThreadPoolExecutor;
@@ -77,7 +74,6 @@ import org.apache.tomcat.InstrumentableC
import org.apache.tomcat.util.ExceptionUtils;
import org.apache.tomcat.util.IntrospectionUtils;
import org.apache.tomcat.util.compat.JreCompat;
-import org.apache.tomcat.util.compat.JreVendor;
import org.apache.tomcat.util.res.StringManager;
/**
@@ -1528,13 +1524,6 @@ public abstract class WebappClassLoaderB
org.apache.juli.logging.LogFactory.release(this);
}
- // Clear the resource bundle cache
- // This shouldn't be necessary, the cache uses weak references but
- // it has caused leaks. Oddly, using the leak detection code in
- // standard host allows the class loader to be GC'd. This has been seen
- // on Sun but not IBM JREs. Maybe a bug in Sun's GC impl?
- clearReferencesResourceBundles();
-
// Clear the classloader reference in the VM's bean introspector
java.beans.Introspector.flushCaches();
@@ -2145,94 +2134,6 @@ public abstract class WebappClassLoaderB
}
}
-
- /**
- * Clear the {@link ResourceBundle} cache of any bundles loaded by this
- * class loader or any class loader where this loader is a parent class
- * loader. Whilst {@link ResourceBundle#clearCache()} could be used there
- * are complications around the
- * {@link org.apache.jasper.servlet.JasperLoader} that mean a reflection
- * based approach is more likely to be complete.
- *
- * The ResourceBundle is using WeakReferences so it shouldn't be pinning
the
- * class loader in memory. However, it is. Therefore clear ou the
- * references.
- */
- private void clearReferencesResourceBundles() {
- // Get a reference to the cache
- try {
- Field cacheListField =
- ResourceBundle.class.getDeclaredField("cacheList");
- cacheListField.setAccessible(true);
-
- // Java 6 uses ConcurrentMap
- // Java 5 uses SoftCache extends Abstract Map
- // So use Map and it *should* work with both
- Map<?,?> cacheList = (Map<?,?>) cacheListField.get(null);
-
- // Get the keys (loader references are in the key)
- Set<?> keys = cacheList.keySet();
-
- Field loaderRefField = null;
-
- // Iterate over the keys looking at the loader instances
- Iterator<?> keysIter = keys.iterator();
-
- int countRemoved = 0;
-
- while (keysIter.hasNext()) {
- Object key = keysIter.next();
-
- if (loaderRefField == null) {
- loaderRefField =
- key.getClass().getDeclaredField("loaderRef");
- loaderRefField.setAccessible(true);
- }
- WeakReference<?> loaderRef =
- (WeakReference<?>) loaderRefField.get(key);
-
- ClassLoader loader = (ClassLoader) loaderRef.get();
-
- while (loader != null && loader != this) {
- loader = loader.getParent();
- }
-
- if (loader != null) {
- keysIter.remove();
- countRemoved++;
- }
- }
-
- if (countRemoved > 0 && log.isDebugEnabled()) {
- log.debug(sm.getString(
-
"webappClassLoader.clearReferencesResourceBundlesCount",
- Integer.valueOf(countRemoved), getContextName()));
- }
- } catch (SecurityException e) {
- log.warn(sm.getString(
- "webappClassLoader.clearReferencesResourceBundlesFail",
- getContextName()), e);
- } catch (NoSuchFieldException e) {
- if (JreVendor.IS_ORACLE_JVM) {
- log.warn(sm.getString(
- "webappClassLoader.clearReferencesResourceBundlesFail",
- getContextName()), e);
- } else {
- log.debug(sm.getString(
- "webappClassLoader.clearReferencesResourceBundlesFail",
- getContextName()), e);
- }
- } catch (IllegalArgumentException e) {
- log.warn(sm.getString(
- "webappClassLoader.clearReferencesResourceBundlesFail",
- getContextName()), e);
- } catch (IllegalAccessException e) {
- log.warn(sm.getString(
- "webappClassLoader.clearReferencesResourceBundlesFail",
- getContextName()), e);
- }
- }
-
/**
* Find specified class in local repositories.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
