You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2016/05/20 11:05:13 UTC
svn commit: r1744706 - in /tomcat/tc8.5.x/trunk: ./
java/org/apache/catalina/core/ java/org/apache/catalina/loader/
test/org/apache/catalina/loader/ webapps/docs/config/
Author: markt
Date: Fri May 20 11:05:13 2016
New Revision: 1744706
URL: http://svn.apache.org/viewvc?rev=1744706&view=rev
Log:
Deprecate clearReferencesStatic
Modified:
tomcat/tc8.5.x/trunk/ (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml
tomcat/tc8.5.x/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
tomcat/tc8.5.x/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java
tomcat/tc8.5.x/trunk/webapps/docs/config/context.xml
Propchange: tomcat/tc8.5.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May 20 11:05:13 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
+/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
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/StandardContext.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1744706&r1=1744705&r2=1744706&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/StandardContext.java Fri May 20 11:05:13 2016
@@ -721,7 +721,10 @@ public class StandardContext extends Con
* without memory leaks using recent JVMs should operate correctly with this
* option set to <code>false</code>. If not specified, the default value of
* <code>false</code> will be used.
+ *
+ * @deprecated This option will be removed in Tomcat 8.5
*/
+ @Deprecated
private boolean clearReferencesStatic = false;
/**
@@ -2592,7 +2595,10 @@ public class StandardContext extends Con
/**
* @return the clearReferencesStatic flag for this Context.
+ *
+ * @deprecated This option will be removed in Tomcat 8.5
*/
+ @Deprecated
public boolean getClearReferencesStatic() {
return (this.clearReferencesStatic);
@@ -2604,7 +2610,10 @@ public class StandardContext extends Con
* Set the clearReferencesStatic feature for this Context.
*
* @param clearReferencesStatic The new flag value
+ *
+ * @deprecated This option will be removed in Tomcat 8.5
*/
+ @Deprecated
public void setClearReferencesStatic(boolean clearReferencesStatic) {
boolean oldClearReferencesStatic = this.clearReferencesStatic;
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml?rev=1744706&r1=1744705&r2=1744706&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml Fri May 20 11:05:13 2016
@@ -87,7 +87,7 @@
type="boolean"/>
<attribute name="clearReferencesStatic"
- description="Should Tomcat attempt to null out any static or final fields from loaded classes when a web application is stopped as a work around for apparent garbage collection bugs and application coding errors?"
+ description="Deprecated. Will be removed in Tomcat 8.5. Should Tomcat attempt to null out any static or final fields from loaded classes when a web application is stopped as a work around for apparent garbage collection bugs and application coding errors?"
type="boolean"/>
<attribute name="clearReferencesStopThreads"
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=1744706&r1=1744705&r2=1744706&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 11:05:13 2016
@@ -343,7 +343,10 @@ public abstract class WebappClassLoaderB
* without memory leaks using recent JVMs should operate correctly with this
* option set to <code>false</code>. If not specified, the default value of
* <code>false</code> will be used.
+ *
+ * @deprecated This option will be removed in Tomcat 8.5
*/
+ @Deprecated
private boolean clearReferencesStatic = false;
/**
@@ -543,7 +546,10 @@ public abstract class WebappClassLoaderB
* Return the clearReferencesStatic flag for this Context.
* @return <code>true</code> if the classloader should attempt to set to null
* static final fields in loaded classes
+ *
+ * @deprecated This option will be removed in Tomcat 8.5
*/
+ @Deprecated
public boolean getClearReferencesStatic() {
return (this.clearReferencesStatic);
}
@@ -553,7 +559,10 @@ public abstract class WebappClassLoaderB
* Set the clearReferencesStatic feature for this Context.
*
* @param clearReferencesStatic The new flag value
+ *
+ * @deprecated This option will be removed in Tomcat 8.5
*/
+ @Deprecated
public void setClearReferencesStatic(boolean clearReferencesStatic) {
this.clearReferencesStatic = clearReferencesStatic;
}
Modified: tomcat/tc8.5.x/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java?rev=1744706&r1=1744705&r2=1744706&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java (original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java Fri May 20 11:05:13 2016
@@ -239,6 +239,7 @@ public class TestWebappClassLoaderWeavin
}
+ @SuppressWarnings("deprecation")
@Test
public void testCopiedClassLoaderExcludesResourcesAndTransformers() throws Exception {
Modified: tomcat/tc8.5.x/trunk/webapps/docs/config/context.xml
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/config/context.xml?rev=1744706&r1=1744705&r2=1744706&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/webapps/docs/config/context.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/config/context.xml Fri May 20 11:05:13 2016
@@ -707,6 +707,8 @@
JVMs should operate correctly with this attribute set to
<code>false</code>. If not specified, the default value of
<code>false</code> will be used.</p>
+ <p>This attribute has been deprecated and will be removed in Tomcat
+ 8.5.</p>
</attribute>
<attribute name="clearReferencesStopThreads" required="false">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org