瀏覽代碼

#1785 remove property loading

Shinsuke Sugaya 7 年之前
父節點
當前提交
0b91c12a62
共有 1 個文件被更改,包括 1 次插入33 次删除
  1. 1 33
      src/main/java/org/codelibs/fess/FessLogManager.java

+ 1 - 33
src/main/java/org/codelibs/fess/FessLogManager.java

@@ -15,8 +15,6 @@
  */
 package org.codelibs.fess;
 
-import java.security.AccessController;
-import java.security.PrivilegedAction;
 import java.util.logging.LogManager;
 import java.util.logging.Logger;
 
@@ -24,37 +22,7 @@ public class FessLogManager extends LogManager {
 
     private static final String ORG_APACHE_LOGGING_LOG4J_JUL_LOG_MANAGER = "org.apache.logging.log4j.jul.LogManager";
 
-    private static final LogManager manager;
-
-    static {
-        manager = AccessController.doPrivileged(new PrivilegedAction<LogManager>() {
-            @Override
-            public LogManager run() {
-                LogManager mgr = null;
-                String cname = null;
-                try {
-                    cname = System.getProperty("java.util.logging.manager");
-                    if (cname != null) {
-                        try {
-                            Class<?> clz = ClassLoader.getSystemClassLoader().loadClass(cname);
-                            mgr = (LogManager) clz.newInstance();
-                        } catch (ClassNotFoundException ex) {
-                            Class<?> clz = Thread.currentThread().getContextClassLoader().loadClass(cname);
-                            mgr = (LogManager) clz.newInstance();
-                        }
-                    }
-                } catch (Exception ex) {
-                    System.err.println("Could not load Logmanager \"" + cname + "\"");
-                    ex.printStackTrace();
-                }
-                if (mgr == null) {
-                    mgr = new DefaultLogManager();
-                }
-                return mgr;
-
-            }
-        });
-    }
+    private static final LogManager manager = new DefaultLogManager();;
 
     private static class DefaultLogManager extends LogManager {
         DefaultLogManager() {