From 47f486f9e68ea9e4abef50cbb33c3b31a59b277c Mon Sep 17 00:00:00 2001 From: Elijah Date: Wed, 13 Nov 2019 15:42:49 +0800 Subject: [PATCH] =?UTF-8?q?DEC-10913=20jdk-logger=E7=BA=BF=E7=A8=8Bblocked?= =?UTF-8?q?=EF=BC=8C=E8=AE=A9hibernate=E6=97=A5=E5=BF=97=E8=B7=9F=E9=9A=8F?= =?UTF-8?q?=E5=86=85=E7=BD=AE=E7=9A=84log4j?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../third/org/jboss/logging/Log4jLogger.java | 26 +++++++++---------- .../jboss/logging/Log4jLoggerProvider.java | 4 +-- .../org/jboss/logging/LoggerProviders.java | 4 +-- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/fine-jboss-logging/src/com/fr/third/org/jboss/logging/Log4jLogger.java b/fine-jboss-logging/src/com/fr/third/org/jboss/logging/Log4jLogger.java index 505eccbdb..49402fa39 100644 --- a/fine-jboss-logging/src/com/fr/third/org/jboss/logging/Log4jLogger.java +++ b/fine-jboss-logging/src/com/fr/third/org/jboss/logging/Log4jLogger.java @@ -24,41 +24,41 @@ final class Log4jLogger extends Logger { private static final long serialVersionUID = -5446154366955151335L; - private final org.apache.log4j.Logger logger; + private final com.fr.third.apache.log4j.Logger logger; Log4jLogger(final String name) { super(name); - logger = org.apache.log4j.Logger.getLogger(name); + logger = com.fr.third.apache.log4j.Logger.getLogger(name); } public boolean isEnabled(final Level level) { - final org.apache.log4j.Level l = translate(level); + final com.fr.third.apache.log4j.Level l = translate(level); return logger.isEnabledFor(l) && l.isGreaterOrEqual(logger.getEffectiveLevel()); } protected void doLog(final Level level, final String loggerClassName, final Object message, final Object[] parameters, final Throwable thrown) { - final org.apache.log4j.Level translatedLevel = translate(level); + final com.fr.third.apache.log4j.Level translatedLevel = translate(level); if (logger.isEnabledFor(translatedLevel)) try { logger.log(loggerClassName, translatedLevel, parameters == null || parameters.length == 0 ? message : MessageFormat.format(String.valueOf(message), parameters), thrown); } catch (Throwable ignored) {} } protected void doLogf(final Level level, final String loggerClassName, final String format, final Object[] parameters, final Throwable thrown) { - final org.apache.log4j.Level translatedLevel = translate(level); + final com.fr.third.apache.log4j.Level translatedLevel = translate(level); if (logger.isEnabledFor(translatedLevel)) try { logger.log(loggerClassName, translatedLevel, parameters == null ? String.format(format) : String.format(format, parameters), thrown); } catch (Throwable ignored) {} } - private static org.apache.log4j.Level translate(final Level level) { + private static com.fr.third.apache.log4j.Level translate(final Level level) { if (level != null) switch (level) { - case FATAL: return org.apache.log4j.Level.FATAL; - case ERROR: return org.apache.log4j.Level.ERROR; - case WARN: return org.apache.log4j.Level.WARN; - case INFO: return org.apache.log4j.Level.INFO; - case DEBUG: return org.apache.log4j.Level.DEBUG; - case TRACE: return org.apache.log4j.Level.TRACE; + case FATAL: return com.fr.third.apache.log4j.Level.FATAL; + case ERROR: return com.fr.third.apache.log4j.Level.ERROR; + case WARN: return com.fr.third.apache.log4j.Level.WARN; + case INFO: return com.fr.third.apache.log4j.Level.INFO; + case DEBUG: return com.fr.third.apache.log4j.Level.DEBUG; + case TRACE: return com.fr.third.apache.log4j.Level.TRACE; } - return org.apache.log4j.Level.ALL; + return com.fr.third.apache.log4j.Level.ALL; } } diff --git a/fine-jboss-logging/src/com/fr/third/org/jboss/logging/Log4jLoggerProvider.java b/fine-jboss-logging/src/com/fr/third/org/jboss/logging/Log4jLoggerProvider.java index d002951f3..123bc51c4 100644 --- a/fine-jboss-logging/src/com/fr/third/org/jboss/logging/Log4jLoggerProvider.java +++ b/fine-jboss-logging/src/com/fr/third/org/jboss/logging/Log4jLoggerProvider.java @@ -21,8 +21,8 @@ package com.fr.third.org.jboss.logging; import java.util.Collections; import java.util.Map; -import org.apache.log4j.MDC; -import org.apache.log4j.NDC; +import com.fr.third.apache.log4j.MDC; +import com.fr.third.apache.log4j.NDC; final class Log4jLoggerProvider implements LoggerProvider { diff --git a/fine-jboss-logging/src/com/fr/third/org/jboss/logging/LoggerProviders.java b/fine-jboss-logging/src/com/fr/third/org/jboss/logging/LoggerProviders.java index ba4799775..ea74e1d1a 100644 --- a/fine-jboss-logging/src/com/fr/third/org/jboss/logging/LoggerProviders.java +++ b/fine-jboss-logging/src/com/fr/third/org/jboss/logging/LoggerProviders.java @@ -131,10 +131,10 @@ final class LoggerProviders { } private static LoggerProvider tryLog4j(final ClassLoader cl, final String via) throws ClassNotFoundException { - Class.forName("org.apache.log4j.LogManager", true, cl); + Class.forName("com.fr.third.apache.log4j.LogManager", true, cl); // JBLOGGING-65 - slf4j can disguise itself as log4j. Test for a class that slf4j doesn't provide. // JBLOGGING-94 - JBoss Logging does not detect org.apache.logging.log4j:log4j-1.2-api:2.0 - Class.forName("org.apache.log4j.config.PropertySetter", true, cl); + Class.forName("com.fr.third.apache.log4j.config.PropertySetter", true, cl); final LoggerProvider provider = new Log4jLoggerProvider(); logProvider(provider, via); return provider;