From b221ad606802fd593ece2c70fc120d1fe3fb9ae5 Mon Sep 17 00:00:00 2001 From: markt Date: Wed, 2 Feb 2011 14:55:36 +0000 Subject: [PATCH] Clarify git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1066489 13f79535-47bb-0310-9956-ffa450edef68 --- webapps/docs/changelog.xml | 8 ++++---- webapps/docs/config/context.xml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 14e32ee57..3a61fd299 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -103,10 +103,10 @@ (kkolinko) - 50642: Move the HttpClient keep-alive thread memory leak - protection from the JreMemoryLeakPreventionListener to the - WebappClassLoader since the thread that triggers the memory leak is - created on demand. (markt) + 50642: Move the sun.net.www.http.HttpClient + keep-alive thread memory leak protection from the + JreMemoryLeakPreventionListener to the WebappClassLoader since the + thread that triggers the memory leak is created on demand. (markt) 50673: Improve Catalina shutdown when running as a service. diff --git a/webapps/docs/config/context.xml b/webapps/docs/config/context.xml index 2465bd185..d4e32b377 100644 --- a/webapps/docs/config/context.xml +++ b/webapps/docs/config/context.xml @@ -504,10 +504,10 @@ -

If true and an HttpClient keep-alive timer thread has - been started by this web application and is still running, Tomcat will - change the context class loader for that thread from the current - WebappClassLoader to +

If true and an sun.net.www.http.HttpClient + keep-alive timer thread has been started by this web application and is + still running, Tomcat will change the context class loader for that + thread from the current WebappClassLoader to WebappClassLoader#parent to prevent a memory leak. Note that the keep-alive timer thread will stop on its own once the keep-alives all expire however, on a busy system that might not happen -- 2.11.0