bug 49159: Improve ThreadLocal memory leak clean-up

https://issues.apache.org/bugzilla/show_bug.cgi?id=49159

- merged LocalStrings.properties file from package o.a.t.u.threads to o.a.t.u.threads.res
- removed 3 i18n keys that are no longer used by tc7. They were used by the old ThreadPool implementation of tc6

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1051682 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/tomcat/util/threads/LocalStrings.properties b/java/org/apache/tomcat/util/threads/LocalStrings.properties
deleted file mode 100644 (file)
index b67afa5..0000000
--- a/java/org/apache/tomcat/util/threads/LocalStrings.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-threadPoolExecutor.threadStoppedToAvoidPotentialLeak=Stopping thread {0} to avoid potential memory leaks after a context was stopped.

diff --git a/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java b/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java
index f4ef350..5243a5d 100644 (file)
--- a/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java
+++ b/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java
@@ -42,7 +42,7 @@ public class ThreadPoolExecutor extends java.util.concurrent.ThreadPoolExecutor
      * The string manager for this package.
      */
     protected static final StringManager sm = StringManager
-            .getManager(Constants.Package);
+            .getManager("org.apache.tomcat.util.threads.res");
 
     private static final Log log = LogFactory.getLog(ThreadPoolExecutor.class);
 

diff --git a/java/org/apache/tomcat/util/threads/res/LocalStrings.properties b/java/org/apache/tomcat/util/threads/res/LocalStrings.properties
index 7f99b19..b67afa5 100644 (file)
--- a/java/org/apache/tomcat/util/threads/res/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/threads/res/LocalStrings.properties
@@ -13,6 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-threadpool.busy=All threads ({0}) are currently busy, waiting. Increase maxThreads ({1}) or check the servlet status
-threadpool.max_threads_too_low=maxThreads setting ({0}) too low, set to {1}
-threadpool.thread_error=Caught exception ({0}) executing {1}, terminating thread
+threadPoolExecutor.threadStoppedToAvoidPotentialLeak=Stopping thread {0} to avoid potential memory leaks after a context was stopped.

diff --git a/java/org/apache/tomcat/util/threads/res/LocalStrings_es.properties b/java/org/apache/tomcat/util/threads/res/LocalStrings_es.properties
index ddbd8b3..09697dc 100644 (file)
--- a/java/org/apache/tomcat/util/threads/res/LocalStrings_es.properties
+++ b/java/org/apache/tomcat/util/threads/res/LocalStrings_es.properties
@@ -13,6 +13,3 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-threadpool.busy=Todos los hilos ({0}) est\u00e1n ahora ocupados, esperando. Incremente maxThreads ({1}) o revise el estado del servlet
-threadpool.max_threads_too_low=valor de maxThreads ({0}) demasiado bajo, puesto a {1}
-threadpool.thread_error=Cogida excepci\u00f3n ({0}) ejecutando {1}, terminando hilo

diff --git a/java/org/apache/tomcat/util/threads/res/LocalStrings_fr.properties b/java/org/apache/tomcat/util/threads/res/LocalStrings_fr.properties
index 8371130..09697dc 100644 (file)
--- a/java/org/apache/tomcat/util/threads/res/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/threads/res/LocalStrings_fr.properties
@@ -13,6 +13,3 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-threadpool.busy=Tous les threads ({0}) sont actuellement occup\u00e9s, attente. Augmentez maxThreads ({1}) ou v\u00e9rifiez le servlet status
-threadpool.max_threads_too_low=le r\u00e9glage maxThreads ({0}) est trop bas, mis \u00e0 {1}
-threadpool.thread_error=R\u00e9ception d''une exception ({0}) en ex\u00e9cutant {1}, arr\u00eat du thread

diff --git a/java/org/apache/tomcat/util/threads/res/LocalStrings_ja.properties b/java/org/apache/tomcat/util/threads/res/LocalStrings_ja.properties
index 7e85a26..09697dc 100644 (file)
--- a/java/org/apache/tomcat/util/threads/res/LocalStrings_ja.properties
+++ b/java/org/apache/tomcat/util/threads/res/LocalStrings_ja.properties
@@ -13,6 +13,3 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-threadpool.busy=\u3059\u3079\u3066\u306e\u30b9\u30ec\u30c3\u30c9 ({0}) \u304c\u73fe\u5728\u7a3c\u50cd\u4e2d\u3067\u5f85\u6a5f\u3057\u3066\u3044\u307e\u3059\u3002maxThreads ({1}) \u3092\u5897\u3084\u3059\u304b\u3001\u305d\u306e\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8\u306e\u30b9\u30c6\u30fc\u30bf\u30b9\u3092\u30c1\u30a7\u30c3\u30af\u3057\u3066\u304f\u3060\u3055\u3044
-threadpool.max_threads_too_low=maxThreads\u306e\u8a2d\u5b9a ({0}) \u304c\u5c0f\u3055\u3059\u304e\u308b\u306e\u3067\u3001{1}\u306b\u8a2d\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044
-threadpool.thread_error={1} \u3092\u5b9f\u884c\u4e2d\u306b\u4f8b\u5916 ({0}) \u3092\u30ad\u30e3\u30c3\u30c1\u3057\u305f\u306e\u3067\u3001\u30b9\u30ec\u30c3\u30c9\u3092\u7d42\u4e86\u3057\u307e\u3059