You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rg...@apache.org on 2017/09/24 00:39:39 UTC
logging-log4j2 git commit: LOG4J2-2055 - If Log4j is used as the
Tomcat logging implementation startup might fail if an application also uses
Log4j.
Repository: logging-log4j2
Updated Branches:
refs/heads/master cfc263268 -> 74384c21c
LOG4J2-2055 - If Log4j is used as the Tomcat logging implementation startup might fail if an application also uses Log4j.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/74384c21
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/74384c21
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/74384c21
Branch: refs/heads/master
Commit: 74384c21c688fff51b29facbc427840a2e4700b7
Parents: cfc2632
Author: Ralph Goers <rg...@nextiva.com>
Authored: Sat Sep 23 17:39:33 2017 -0700
Committer: Ralph Goers <rg...@nextiva.com>
Committed: Sat Sep 23 17:39:33 2017 -0700
----------------------------------------------------------------------
.../main/java/org/apache/logging/log4j/util/ProviderUtil.java | 6 +++++-
src/changes/changes.xml | 3 +++
2 files changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/74384c21/log4j-api/src/main/java/org/apache/logging/log4j/util/ProviderUtil.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/util/ProviderUtil.java b/log4j-api/src/main/java/org/apache/logging/log4j/util/ProviderUtil.java
index 75414f4..200a6f3 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/util/ProviderUtil.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/ProviderUtil.java
@@ -64,7 +64,11 @@ public final class ProviderUtil {
private ProviderUtil() {
for (ClassLoader classLoader : LoaderUtil.getClassLoaders()) {
- loadProviders(classLoader);
+ try {
+ loadProviders(classLoader);
+ } catch (Throwable ex) {
+ LOGGER.debug("Unable to retrieve provider from ClassLoader {}", classLoader, ex);
+ }
}
for (final LoaderUtil.UrlResource resource : LoaderUtil.findUrlResources(PROVIDER_RESOURCE)) {
loadProvider(resource.getUrl(), resource.getClassLoader());
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/74384c21/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index dff1de7..e341ebc 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -31,6 +31,9 @@
- "remove" - Removed
-->
<release version="2.9.2" date="2017-XX-XX" description="GA Release 2.9.2">
+ <action issue="LOG4J2-2055" dev="rgoers" type="fix">
+ If Log4j is used as the Tomcat logging implementation startup might fail if an application also uses Log4j.
+ </action>
<action issue="LOG4J2-1896" dev="rpopma" type="update">
Update classes in org.apache.logging.log4j.core.net.ssl in APIs from String to a PasswordProvider producing char[] for passwords.
</action>