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
* <code>sun.misc.GC.requestLatency(long)</code> 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)
</fix>
<fix>
- <bug>51688</bug> JreMemoryLeakPreventionListener now protects against
+ <bug>51688</bug>: JreMemoryLeakPreventionListener now protects against
AWT thread creation. (schultz)
</fix>
</changelog>
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 <code>true</code>.</p>
</attribute>
+
<attribute name="AWTThreadProtection" required="false">
<p>Enables protection so that calls to
<code>java.awt.Toolkit.getDefaultToolkit()</code> triggered by a web
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
