Author: markt
Date: Wed Aug 31 09:23:22 2016
New Revision: 1758560
URL: http://svn.apache.org/viewvc?rev=1758560&view=rev
Log:
The latest Java 9 early access builds have fixed some more memory leaks.
Also disable protection that is fixed in Java 8 when running on Java 8
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 Wed Aug 31 09:23:22 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,1737903,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,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747
924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1756410,1
756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757853,1757903,1757997,1758072-1758075,1758078-1758079,1758369,1758423,1758425-1758427,1758430,1758459,1758483,1758486-1758487,1758499,1758525
+/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,1737903,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,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747
924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1756410,1
756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757853,1757903,1757997,1758072-1758075,1758078-1758079,1758369,1758423,1758425-1758427,1758430,1758459,1758483,1758486-1758487,1758499,1758525,1758556
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=1758560&r1=1758559&r2=1758560&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
Wed Aug 31 09:23:22 2016
@@ -37,6 +37,7 @@ import org.apache.catalina.LifecycleList
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.ExceptionUtils;
+import org.apache.tomcat.util.compat.JreCompat;
import org.apache.tomcat.util.compat.JreVendor;
import org.apache.tomcat.util.res.StringManager;
import org.w3c.dom.Document;
@@ -258,13 +259,13 @@ public class JreMemoryLeakPreventionList
// Trigger a call to sun.awt.AppContext.getAppContext(). This
// will pin the system class loader in memory but that
shouldn't
// be an issue.
- if (appContextProtection) {
+ if (appContextProtection && !JreCompat.isJre8Available()) {
ImageIO.getCacheDirectory();
}
// Trigger the creation of the AWT (AWT-Windows, AWT-XAWT,
// etc.) thread
- if (awtThreadProtection) {
+ if (awtThreadProtection && !JreCompat.isJre9Available()) {
java.awt.Toolkit.getDefaultToolkit();
}
@@ -281,7 +282,7 @@ public class JreMemoryLeakPreventionList
* to terminate
*
*/
- if (gcDaemonProtection) {
+ if (gcDaemonProtection && !JreCompat.isJre9Available()) {
try {
Class<?> clazz = Class.forName("sun.misc.GC");
Method method = clazz.getDeclaredMethod(
@@ -311,7 +312,7 @@ public class JreMemoryLeakPreventionList
* Calling getPolicy retains a static reference to the context
* class loader.
*/
- if (securityPolicyProtection) {
+ if (securityPolicyProtection && !JreCompat.isJre8Available()) {
try {
// Policy.getPolicy();
Class<?> policyClass = Class
@@ -344,7 +345,7 @@ public class JreMemoryLeakPreventionList
* Initializing javax.security.auth.login.Configuration
retains a static reference to the context
* class loader.
*/
- if (securityLoginConfigurationProtection) {
+ if (securityLoginConfigurationProtection &&
!JreCompat.isJre8Available()) {
try {
Class.forName("javax.security.auth.login.Configuration", true,
ClassLoader.getSystemClassLoader());
} catch(ClassNotFoundException e) {
@@ -359,8 +360,10 @@ public class JreMemoryLeakPreventionList
* to the web application class loader.
*
* Instead we initialize JCA right now.
+ *
+ * Fixed in Java 9 onwards (from early access build 133)
*/
- if (tokenPollerProtection) {
+ if (tokenPollerProtection && !JreCompat.isJre9Available()) {
java.security.Security.getProviders();
}
@@ -393,7 +396,10 @@ public class JreMemoryLeakPreventionList
}
}
- if (xmlParsingProtection) {
+ /*
+ * Fixed in Java 9 onwards (from early access build 133)
+ */
+ if (xmlParsingProtection && !JreCompat.isJre9Available()) {
// There are two known issues with XML parsing that affect
// Java 7+. The issues both relate to cached Exception
// instances that retain a link to the TCCL via the
@@ -419,7 +425,7 @@ public class JreMemoryLeakPreventionList
}
}
- if (ldapPoolProtection) {
+ if (ldapPoolProtection && !JreCompat.isJre9Available()) {
try {
Class.forName("com.sun.jndi.ldap.LdapPoolManager");
} catch (ClassNotFoundException e) {
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=1758560&r1=1758559&r2=1758560&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Wed Aug 31 09:23:22 2016
@@ -186,6 +186,12 @@
<fix>
Make timing attacks against the Realm implementations harder. (schultz)
</fix>
+ <fix>
+ A number of the JRE memory leaks addressed by the
+ <code>JreMemoryLeakPreventionListener</code> have been fixed in Java 9
+ so the associated protection is now disabled when running on Java 9
+ onwards. (markt)
+ </fix>
</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=1758560&r1=1758559&r2=1758560&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/webapps/docs/config/listeners.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/config/listeners.xml Wed Aug 31 09:23:22
2016
@@ -184,6 +184,8 @@
application do not result in a memory leak. Note that enabling this
protection will trigger a requirement for a graphical environment
unless
Java is started in head-less mode. The default is <code>false</code>.
+ This protection is disabled if running on Java 8 onwards since the leak
+ has been fixed for Java 8 onwards.
</p>
</attribute>
@@ -191,7 +193,9 @@
<p>Enables protection so that calls to
<code>java.awt.Toolkit.getDefaultToolkit()</code> triggered by a web
application do not result in a memory leak.
- Defaults to <code>false</code> because an AWT thread is launched.</p>
+ Defaults to <code>false</code> because an AWT thread is launched. This
+ protection is disabled if running on Java 9 onwards since the leak has
+ been fixed for Java 9 onwards.</p>
</attribute>
<attribute name="classesToInitialize" required="false">
@@ -219,7 +223,9 @@
trigger a call to this method. A side effect of enabling this
protection
is the creation of a thread named "GC Daemon". The protection uses
reflection to access internal Sun classes and may generate errors on
- startup on non-Sun JVMs. The default is <code>true</code>.</p>
+ startup on non-Sun JVMs. The default is <code>true</code>. This
+ protection is disabled if running on Java 9 onwards since the leak has
+ been fixed for Java 9 onwards.</p>
</attribute>
<attribute name="ldapPoolProtection" required="false">
@@ -232,7 +238,8 @@
class the PoolCleaner thread will be configured with the thread's
context class loader set to the web application class loader which in
turn will trigger a memory leak on reload. Defaults to
- <code>true</code>.</p>
+ <code>true</code>. This protection is disabled if running on Java 9
+ onwards since the leak has been fixed for Java 9 onwards.</p>
</attribute>
<attribute name="securityLoginConfigurationProtection" required="false">
@@ -242,20 +249,22 @@
class will trigger the initializer that will retain a static reference
to the context class loader. The protection loads the class with the
system class loader to ensure that the static initializer is not
- triggered by a web application. Defaults to <code>true</code>.</p>
+ triggered by a web application. Defaults to <code>true</code>. This
+ protection is disabled if running on Java 8 onwards since the leak has
+ been fixed for Java 8 onwards.</p>
</attribute>
<attribute name="securityPolicyProtection" required="false">
<p>Enables protection so that usage of the deprecated
- <code>javax.security.auth.Policy</code> class by a web application
does not
- result in a memory leak. The first access of this class will trigger
the
- static initializer that will retain a static reference to the context
- class loader. The protection calls the <code>getPolicy()</code> method
- of this class to ensure that the static initializer is not triggered by
- a web application. Defaults to <code>true</code>.</p>
+ <code>javax.security.auth.Policy</code> class by a web application does
+ not result in a memory leak. The first access of this class will
trigger
+ the static initializer that will retain a static reference to the
+ context class loader. The protection calls the <code>getPolicy()</code>
+ method of this class to ensure that the static initializer is not
+ triggered by a web application. Defaults to <code>true</code>.</p>
<p>Note: The underlying leak has been fixed in Java 7 update 51 onwards
- and Java 8 onwards. This option is unnecessary if running on a fixed
- version of Java.</p>
+ and Java 8 onwards. This protection is therefor disabled if running on
+ Java 8 onwards.</p>
</attribute>
<attribute name="tokenPollerProtection" required="false">
@@ -267,7 +276,9 @@
deployment when the MessageDigest for generating session IDs is
initialized. As a result the thread has the Webapp class loader as its
thread context class loader. Enabling the protection initializes JCA
- early during Tomcat startup. Defaults to <code>true</code>.</p>
+ early during Tomcat startup. Defaults to <code>true</code>. This
+ protection is disabled if running on Java 9 onwards since the leak has
+ been fixed for Java 9 onwards.</p>
</attribute>
<attribute name="urlCacheProtection" required="false">
@@ -283,7 +294,9 @@
<p>Enables protection so that parsing XML files within a web
application
does not result in a memory leak. Note that memory profilers may not
display the GC root associated with this leak making it particularly
- hard to diagnose. Defaults to <code>true</code>.</p>
+ hard to diagnose. Defaults to <code>true</code>. This protection is
+ disabled if running on Java 9 onwards since the leak has been fixed for
+ Java 9 onwards.</p>
</attribute>
</attributes>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
