This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push: new c624511 Move resource files to same package as code for consistency c624511 is described below commit c624511cac767661b758769dbb19c4a2da4d7582 Author: Mark Thomas <ma...@apache.org> AuthorDate: Fri Jul 23 16:01:36 2021 +0100 Move resource files to same package as code for consistency --- java/org/apache/tomcat/util/threads/{res => }/LocalStrings.properties | 0 .../apache/tomcat/util/threads/{res => }/LocalStrings_es.properties | 0 .../apache/tomcat/util/threads/{res => }/LocalStrings_fr.properties | 0 .../apache/tomcat/util/threads/{res => }/LocalStrings_ja.properties | 0 .../apache/tomcat/util/threads/{res => }/LocalStrings_ko.properties | 0 .../apache/tomcat/util/threads/{res => }/LocalStrings_zh_CN.properties | 0 java/org/apache/tomcat/util/threads/TaskQueue.java | 3 +-- java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java | 2 +- 8 files changed, 2 insertions(+), 3 deletions(-) diff --git a/java/org/apache/tomcat/util/threads/res/LocalStrings.properties b/java/org/apache/tomcat/util/threads/LocalStrings.properties similarity index 100% rename from java/org/apache/tomcat/util/threads/res/LocalStrings.properties rename to java/org/apache/tomcat/util/threads/LocalStrings.properties diff --git a/java/org/apache/tomcat/util/threads/res/LocalStrings_es.properties b/java/org/apache/tomcat/util/threads/LocalStrings_es.properties similarity index 100% rename from java/org/apache/tomcat/util/threads/res/LocalStrings_es.properties rename to java/org/apache/tomcat/util/threads/LocalStrings_es.properties diff --git a/java/org/apache/tomcat/util/threads/res/LocalStrings_fr.properties b/java/org/apache/tomcat/util/threads/LocalStrings_fr.properties similarity index 100% rename from java/org/apache/tomcat/util/threads/res/LocalStrings_fr.properties rename to java/org/apache/tomcat/util/threads/LocalStrings_fr.properties diff --git a/java/org/apache/tomcat/util/threads/res/LocalStrings_ja.properties b/java/org/apache/tomcat/util/threads/LocalStrings_ja.properties similarity index 100% rename from java/org/apache/tomcat/util/threads/res/LocalStrings_ja.properties rename to java/org/apache/tomcat/util/threads/LocalStrings_ja.properties diff --git a/java/org/apache/tomcat/util/threads/res/LocalStrings_ko.properties b/java/org/apache/tomcat/util/threads/LocalStrings_ko.properties similarity index 100% rename from java/org/apache/tomcat/util/threads/res/LocalStrings_ko.properties rename to java/org/apache/tomcat/util/threads/LocalStrings_ko.properties diff --git a/java/org/apache/tomcat/util/threads/res/LocalStrings_zh_CN.properties b/java/org/apache/tomcat/util/threads/LocalStrings_zh_CN.properties similarity index 100% rename from java/org/apache/tomcat/util/threads/res/LocalStrings_zh_CN.properties rename to java/org/apache/tomcat/util/threads/LocalStrings_zh_CN.properties diff --git a/java/org/apache/tomcat/util/threads/TaskQueue.java b/java/org/apache/tomcat/util/threads/TaskQueue.java index 24c0ad6..0e7cea6 100644 --- a/java/org/apache/tomcat/util/threads/TaskQueue.java +++ b/java/org/apache/tomcat/util/threads/TaskQueue.java @@ -33,8 +33,7 @@ import org.apache.tomcat.util.res.StringManager; public class TaskQueue extends LinkedBlockingQueue<Runnable> { private static final long serialVersionUID = 1L; - protected static final StringManager sm = StringManager - .getManager("org.apache.tomcat.util.threads.res"); + protected static final StringManager sm = StringManager.getManager(TaskQueue.class); private static final int DEFAULT_FORCED_REMAINING_CAPACITY = -1; private transient volatile ThreadPoolExecutor parent = null; diff --git a/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java b/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java index 630b9f0..f17c881 100644 --- a/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java +++ b/java/org/apache/tomcat/util/threads/ThreadPoolExecutor.java @@ -329,7 +329,7 @@ import org.apache.tomcat.util.res.StringManager; */ public class ThreadPoolExecutor extends AbstractExecutorService { - protected static final StringManager sm = StringManager.getManager("org.apache.tomcat.util.threads.res"); + protected static final StringManager sm = StringManager.getManager(ThreadPoolExecutor.class); /** * The main pool control state, ctl, is an atomic integer packing --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org