Repository: logging-log4j2 Updated Branches: refs/heads/master c07c2d823 -> f67fac870
Use LoaderUtil.loadClass instead of Class.forName Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/3ae452ef Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/3ae452ef Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/3ae452ef Branch: refs/heads/master Commit: 3ae452ef1190ef9cffe752fff1fc62a14472cb7b Parents: c07c2d8 Author: Matt Sicker <[email protected]> Authored: Tue Feb 23 23:35:08 2016 -0600 Committer: Matt Sicker <[email protected]> Committed: Tue Feb 23 23:35:08 2016 -0600 ---------------------------------------------------------------------- .../main/java/org/apache/logging/log4j/spi/AbstractLogger.java | 2 +- .../src/main/java/org/apache/logging/slf4j/Log4jLogger.java | 3 ++- .../java/org/apache/logging/slf4j/SLF4JLoggerContextFactory.java | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/3ae452ef/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java b/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java index 6a50c8d..b900d3b 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java @@ -205,7 +205,7 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable { */ private static boolean isClassAvailable(final String className) { try { - return Class.forName(className) != null; + return LoaderUtil.loadClass(className) != null; } catch (final Throwable e) { return false; } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/3ae452ef/log4j-slf4j-impl/src/main/java/org/apache/logging/slf4j/Log4jLogger.java ---------------------------------------------------------------------- diff --git a/log4j-slf4j-impl/src/main/java/org/apache/logging/slf4j/Log4jLogger.java b/log4j-slf4j-impl/src/main/java/org/apache/logging/slf4j/Log4jLogger.java index e5b2e1f..ec4decb 100644 --- a/log4j-slf4j-impl/src/main/java/org/apache/logging/slf4j/Log4jLogger.java +++ b/log4j-slf4j-impl/src/main/java/org/apache/logging/slf4j/Log4jLogger.java @@ -27,6 +27,7 @@ import org.apache.logging.log4j.message.Message; import org.apache.logging.log4j.message.ParameterizedMessage; import org.apache.logging.log4j.message.SimpleMessage; import org.apache.logging.log4j.spi.ExtendedLogger; +import org.apache.logging.log4j.util.LoaderUtil; import org.slf4j.Marker; import org.slf4j.MarkerFactory; import org.slf4j.impl.StaticMarkerBinder; @@ -412,7 +413,7 @@ public class Log4jLogger implements LocationAwareLogger, Serializable { private static EventDataConverter createConverter() { try { - Class.forName("org.slf4j.ext.EventData"); + LoaderUtil.loadClass("org.slf4j.ext.EventData"); return new EventDataConverter(); } catch (final ClassNotFoundException cnfe) { return null; http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/3ae452ef/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLoggerContextFactory.java ---------------------------------------------------------------------- diff --git a/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLoggerContextFactory.java b/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLoggerContextFactory.java index aec9458..2f20685 100644 --- a/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLoggerContextFactory.java +++ b/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLoggerContextFactory.java @@ -21,6 +21,7 @@ import java.net.URI; import org.apache.logging.log4j.spi.LoggerContext; import org.apache.logging.log4j.spi.LoggerContextFactory; import org.apache.logging.log4j.status.StatusLogger; +import org.apache.logging.log4j.util.LoaderUtil; /** * @@ -33,7 +34,7 @@ public class SLF4JLoggerContextFactory implements LoggerContextFactory { // LOG4J2-230, LOG4J2-204 (improve error reporting when misconfigured) boolean misconfigured = false; try { - Class.forName("org.slf4j.helpers.Log4jLoggerFactory"); + LoaderUtil.loadClass("org.slf4j.helpers.Log4jLoggerFactory"); misconfigured = true; } catch (final ClassNotFoundException classNotFoundIsGood) { LOGGER.debug("org.slf4j.helpers.Log4jLoggerFactory is not on classpath. Good!");
