Return-Path:
X-Original-To: apmail-tomcat-dev-archive@www.apache.org
Delivered-To: apmail-tomcat-dev-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
by minotaur.apache.org (Postfix) with SMTP id D828B9D47
for ;
Sun, 26 Aug 2012 23:45:06 +0000 (UTC)
Received: (qmail 90045 invoked by uid 500); 26 Aug 2012 23:45:06 -0000
Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org
Received: (qmail 89977 invoked by uid 500); 26 Aug 2012 23:45:06 -0000
Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm
Precedence: bulk
List-Help:
List-Unsubscribe:
List-Post:
List-Id:
Reply-To: "Tomcat Developers List"
Delivered-To: mailing list dev@tomcat.apache.org
Received: (qmail 89967 invoked by uid 99); 26 Aug 2012 23:45:06 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 26 Aug 2012 23:45:06 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 26 Aug 2012 23:45:03 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
by eris.apache.org (Postfix) with ESMTP id E219F23889DA
for ; Sun, 26 Aug 2012 23:44:19 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1377543 - in /tomcat/tc7.0.x/trunk:
java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
webapps/docs/config/systemprops.xml
Date: Sun, 26 Aug 2012 23:44:19 -0000
To: dev@tomcat.apache.org
From: fhanik@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20120826234419.E219F23889DA@eris.apache.org>
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 @@
$CATALINA_BASE/catalina.properties
file.
+
+ The timeout period set when the leak prevention code triggers the GC Daemon.
+ If not specified, the default value of Long.MAX_VALUE-1
will be used.
+
+
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org