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 2018/08/01 16:04:33 UTC

logging-log4j2 git commit: [LOG4J2-2397] Predeployment of PersistenceUnit that using Log4j as session logger failed (Closes #198).

Repository: logging-log4j2
Updated Branches:
  refs/heads/release-2.x 690709edc -> 1b547234c


[LOG4J2-2397] Predeployment of PersistenceUnit that using Log4j as
session logger failed (Closes #198).

Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/1b547234
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/1b547234
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/1b547234

Branch: refs/heads/release-2.x
Commit: 1b547234c1b64dfe0e57fff13d7480e13752903e
Parents: 690709e
Author: Gary Gregory <gg...@apache.org>
Authored: Wed Aug 1 10:04:29 2018 -0600
Committer: Gary Gregory <gg...@apache.org>
Committed: Wed Aug 1 10:04:29 2018 -0600

----------------------------------------------------------------------
 .../main/java/org/apache/logging/log4j/util/PropertiesUtil.java   | 2 +-
 src/changes/changes.xml                                           | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1b547234/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertiesUtil.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertiesUtil.java b/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertiesUtil.java
index 9349b2e..2a9ff7f 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertiesUtil.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertiesUtil.java
@@ -316,7 +316,7 @@ public final class PropertiesUtil {
 
         private Environment(final PropertySource propertySource) {
             sources.add(propertySource);
-            for (final PropertySource source : ServiceLoader.load(PropertySource.class)) {
+            for (final PropertySource source : ServiceLoader.load(PropertySource.class, PropertySource.class.getClassLoader())) {
                 sources.add(source);
             }
             reload();

http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1b547234/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 83ba764..7f473e4 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -37,6 +37,9 @@
         ExtendedThrowablePatternConverter default configurations no longer allocate
         an additional buffer for stack trace contents.
       </action>
+      <action issue="LOG4J2-2397" dev="ggregory" type="fix" due-to="EckelDong">
+        Predeployment of PersistenceUnit that using Log4j as session logger failed (#198).
+      </action>
     </release>
     <release version="2.11.1" date="2018-07-22" description="GA Release 2.11.1">
       <action issue="LOG4J2-2389" dev="rgoers" type="fix" due-to="Liu Wen">