Author: markt
Date: Thu May 5 16:32:34 2016
New Revision: 1742449
URL: http://svn.apache.org/viewvc?rev=1742449&view=rev
Log:
Remove unnecessary code
Modified:
tomcat/tc8.5.x/trunk/ (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
tomcat/tc8.5.x/trunk/webapps/docs/config/listeners.xml
Propchange: tomcat/tc8.5.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 5 16:32:34 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
+/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
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java?rev=1742449&r1=1742448&r2=1742449&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
Thu May 5 16:32:34 2016
@@ -90,19 +90,6 @@ public class JreMemoryLeakPreventionList
}
/**
- * Protect against the memory leak caused when the
- * <code>sun.java2d.Disposer</code> class is loaded by a web application.
- * Defaults to <code>false</code> because a new Thread is launched.
- */
- private boolean java2dDisposerProtection = false;
- public boolean isJava2DDisposerProtection() {
- return java2dDisposerProtection;
- }
- public void setJava2DDisposerProtection(boolean java2dDisposerProtection) {
- this.java2dDisposerProtection = java2dDisposerProtection;
- }
-
- /**
* Protect against the memory leak caused when the first call to
* <code>sun.misc.GC.requestLatency(long)</code> is triggered by a web
* application. This first call will start a GC Daemon thread with the
@@ -281,17 +268,6 @@ public class JreMemoryLeakPreventionList
java.awt.Toolkit.getDefaultToolkit();
}
- // Trigger the creation of the "Java2D Disposer" thread.
- // See https://bz.apache.org/bugzilla/show_bug.cgi?id=51687
- if(java2dDisposerProtection) {
- try {
- Class.forName("sun.java2d.Disposer");
- } catch (ClassNotFoundException cnfe) {
- // Ignore this case: we must be running on a
- // non-Sun-based JRE.
- }
- }
-
/*
* Several components end up calling
* sun.misc.GC.requestLatency(long) which creates a daemon
Modified: tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml?rev=1742449&r1=1742448&r2=1742449&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Thu May 5 16:32:34 2016
@@ -176,6 +176,12 @@
the contents of <code>WEB-INF/classes</code> as a possible exploded
JAR.
(markt)
</fix>
+ <scode>
+ Remove the <code>java2DDisposerProtection</code> option from the
+ <code>JreMemoryLeakPreventionListener</code>. The leak is fixed in Java
+ 7 onwards and Tomcat 9 requires Java 8 so the option is unnecessary.
+ (markt)
+ </scode>
</changelog>
</subsection>
<subsection name="Coyote">
Modified: tomcat/tc8.5.x/trunk/webapps/docs/config/listeners.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/config/listeners.xml?rev=1742449&r1=1742448&r2=1742449&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/webapps/docs/config/listeners.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/config/listeners.xml Thu May 5 16:32:34
2016
@@ -222,13 +222,6 @@
startup on non-Sun JVMs. The default is <code>true</code>.</p>
</attribute>
- <attribute name="java2DDisposerProtection" required="false">
- <p>Enables protection so that loading the
- <code>sun.java2d.Disposer</code> class by a web application does not
- result in a memory leak.
- Defaults to <code>false</code> because a thread is launched.</p>
- </attribute>
-
<attribute name="ldapPoolProtection" required="false">
<p>Enables protection so that the PoolCleaner thread started by
<code>com.sun.jndi.ldap.LdapPoolManager</code> does not result in a
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
