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 DE47686AA
for ;
Wed, 24 Aug 2011 22:30:58 +0000 (UTC)
Received: (qmail 63687 invoked by uid 500); 24 Aug 2011 22:30:57 -0000
Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org
Received: (qmail 63582 invoked by uid 500); 24 Aug 2011 22:30:57 -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 63568 invoked by uid 99); 24 Aug 2011 22:30:56 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 24 Aug 2011 22:30:56 +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; Wed, 24 Aug 2011 22:30:54 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
by eris.apache.org (Postfix) with ESMTP id C8CFF23889D5
for ; Wed, 24 Aug 2011 22:30:32 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1161305 - in /tomcat/tc7.0.x/trunk: ./
java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
webapps/docs/changelog.xml webapps/docs/config/listeners.xml
Date: Wed, 24 Aug 2011 22:30:32 -0000
To: dev@tomcat.apache.org
From: kkolinko@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20110824223032.C8CFF23889D5@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org
Author: kkolinko
Date: Wed Aug 24 22:30:32 2011
New Revision: 1161305
URL: http://svn.apache.org/viewvc?rev=1161305&view=rev
Log:
Update mergeinfo as if r1161303 has been merged to tc7.0.x.
Correct whitespace and a typo in changelog.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc7.0.x/trunk/webapps/docs/config/listeners.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 24 22:30:32 2011
@@ -1 +1 @@
-/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776
+/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303
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=1161305&r1=1161304&r2=1161305&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 Wed Aug 24 22:30:32 2011
@@ -79,7 +79,7 @@ public class JreMemoryLeakPreventionList
public void setAWTThreadProtection(boolean awtThreadProtection) {
this.awtThreadProtection = awtThreadProtection;
}
-
+
/**
* Protect against the memory leak caused when the first call to
* sun.misc.GC.requestLatency(long)
is triggered by a web
@@ -233,10 +233,10 @@ public class JreMemoryLeakPreventionList
// Trigger the creation of the AWT (AWT-Windows, AWT-XAWT,
// etc.) thread
- if(awtThreadProtection) {
+ if (awtThreadProtection) {
java.awt.Toolkit.getDefaultToolkit();
}
-
+
/*
* Several components end up calling:
* sun.misc.GC.requestLatency(long)
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1161305&r1=1161304&r2=1161305&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Wed Aug 24 22:30:32 2011
@@ -90,7 +90,7 @@
on a suggestion by Felix Schumacher. (markt)
- 51688 JreMemoryLeakPreventionListener now protects against
+ 51688: JreMemoryLeakPreventionListener now protects against
AWT thread creation. (schultz)
Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/listeners.xml
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/config/listeners.xml?rev=1161305&r1=1161304&r2=1161305&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/config/listeners.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/config/listeners.xml Wed Aug 24 22:30:32 2011
@@ -173,6 +173,7 @@
it is strongly recommended that this protection is enabled. The default
is true
.
+
Enables protection so that calls to
java.awt.Toolkit.getDefaultToolkit()
triggered by a web
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org