Author: fhanik
Date: Sun Aug 26 23:44:19 2012
New Revision: 1377543
URL: http://svn.apache.org/viewvc?rev=1377543&view=rev
Log:
Per patches supplied in
https://issues.apache.org/bugzilla/show_bug.cgi?id=53267
Don't hard code the value, make the default the same as the hard coded value
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
tomcat/tc7.0.x/trunk/webapps/docs/config/systemprops.xml
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java?rev=1377543&r1=1377542&r2=1377543&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
Sun Aug 26 23:44:19 2012
@@ -297,7 +297,7 @@ public class JreMemoryLeakPreventionList
Method method = clazz.getDeclaredMethod(
"requestLatency",
new Class[] {long.class});
- method.invoke(null, Long.valueOf(Long.MAX_VALUE - 1));
+ method.invoke(null,
Long.getLong("org.apache.catalina.core.jreMemoryLeakPreventionGCDaemonPeriod",
Long.valueOf(Long.MAX_VALUE-1)));
} catch (ClassNotFoundException e) {
if (System.getProperty("java.vendor").startsWith(
"Sun")) {
Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/systemprops.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/config/systemprops.xml?rev=1377543&r1=1377542&r2=1377543&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/config/systemprops.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/config/systemprops.xml Sun Aug 26
23:44:19 2012
@@ -637,6 +637,11 @@
<code>$CATALINA_BASE/catalina.properties</code> file.</p>
</property>
+ <property name="org.apache.catalina.core.
jreMemoryLeakPreventionGCDaemonPeriod">
+ <p>The timeout period set when the leak prevention code triggers the GC
Daemon.</p>
+ <p>If not specified, the default value of <code>Long.MAX_VALUE-1</code>
will be used.</p>
+ </property>
+
</properties>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
