You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2021/07/28 11:15:22 UTC
[tomcat] branch main updated: Simplify as must be on Java 11+
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 2642421 Simplify as must be on Java 11+
2642421 is described below
commit 26424219b95ce8e2919256bc6a419bd38c04f8fe
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Jul 28 12:15:14 2021 +0100
Simplify as must be on Java 11+
---
java/org/apache/juli/ClassLoaderLogManager.java | 15 +--------------
1 file changed, 1 insertion(+), 14 deletions(-)
diff --git a/java/org/apache/juli/ClassLoaderLogManager.java b/java/org/apache/juli/ClassLoaderLogManager.java
index 42e8f11..0882c85 100644
--- a/java/org/apache/juli/ClassLoaderLogManager.java
+++ b/java/org/apache/juli/ClassLoaderLogManager.java
@@ -50,23 +50,11 @@ import java.util.logging.Logger;
*/
public class ClassLoaderLogManager extends LogManager {
- private static final boolean isJava9;
-
private static ThreadLocal<Boolean> addingLocalRootLogger = ThreadLocal.withInitial(() -> Boolean.FALSE);
public static final String DEBUG_PROPERTY =
ClassLoaderLogManager.class.getName() + ".debug";
- static {
- Class<?> c = null;
- try {
- c = Class.forName("java.lang.Runtime$Version");
- } catch (ClassNotFoundException e) {
- // Must be Java 8
- }
- isJava9 = c != null;
- }
-
private final class Cleaner extends Thread {
@Override
@@ -494,8 +482,7 @@ public class ClassLoaderLogManager extends LogManager {
}
// Try the default JVM configuration
if (is == null) {
- File defaultFile = new File(new File(System.getProperty("java.home"),
- isJava9 ? "conf" : "lib"),
+ File defaultFile = new File(new File(System.getProperty("java.home"), "conf"),
"logging.properties");
try {
is = new FileInputStream(defaultFile);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org