You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2015/06/11 07:17:44 UTC
logging-log4j2 git commit: [LOG4J2-1035] Log4j2 tries to
SystemClassLoader when running on Google AppEngine.
Repository: logging-log4j2
Updated Branches:
refs/heads/master 51d5bca9c -> d55f00fbf
[LOG4J2-1035] Log4j2 tries to SystemClassLoader when running on Google
AppEngine.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/d55f00fb
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/d55f00fb
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/d55f00fb
Branch: refs/heads/master
Commit: d55f00fbff5dcb69138734e2734723f5d693bf5b
Parents: 51d5bca
Author: Gary Gregory <ga...@gmail.com>
Authored: Wed Jun 10 22:17:39 2015 -0700
Committer: Gary Gregory <ga...@gmail.com>
Committed: Wed Jun 10 22:17:39 2015 -0700
----------------------------------------------------------------------
.../src/main/java/org/apache/logging/log4j/util/LoaderUtil.java | 4 ++--
src/changes/changes.xml | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d55f00fb/log4j-api/src/main/java/org/apache/logging/log4j/util/LoaderUtil.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/util/LoaderUtil.java b/log4j-api/src/main/java/org/apache/logging/log4j/util/LoaderUtil.java
index 277f0f4..8f68500 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/util/LoaderUtil.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/LoaderUtil.java
@@ -94,7 +94,7 @@ public final class LoaderUtil {
return cl;
}
final ClassLoader ccl = LoaderUtil.class.getClassLoader();
- return ccl == null ? ClassLoader.getSystemClassLoader() : ccl;
+ return ccl == null && !GET_CLASS_LOADER_DISABLED ? ClassLoader.getSystemClassLoader() : ccl;
}
}
@@ -192,7 +192,7 @@ public final class LoaderUtil {
final ClassLoader[] candidates = {
getThreadContextClassLoader(),
LoaderUtil.class.getClassLoader(),
- ClassLoader.getSystemClassLoader()
+ GET_CLASS_LOADER_DISABLED ? null : ClassLoader.getSystemClassLoader()
};
final Collection<UrlResource> resources = new LinkedHashSet<>();
for (final ClassLoader cl : candidates) {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d55f00fb/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 17dd6a5..7fd3446 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -69,6 +69,9 @@
<action issue="LOG4J2-403" dev="ggregory" type="update" due-to="Poorna Subhash P, Jeremy Lautman">
MongoDB appender, username and password should be optional.
</action>
+ <action issue="LOG4J2-1035" dev="ggregory" type="update">
+ Log4j2 tries to SystemClassLoader when running on Google AppEngine.
+ </action>
<action issue="LOG4J2-1022" dev="rgoers" type="update">
Allow a list of keys to be specified in the MDC pattern converter.
</action>