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/04/26 15:53:35 UTC

logging-log4j2 git commit: [LOG4J2-2327] java.util.ServiceConfigurationError: org.apache.logging.log4j.util.PropertySource: Provider org.apache.logging.log4j.util.EnvironmentPropertySource not a subtype.

Repository: logging-log4j2
Updated Branches:
  refs/heads/release-2.x b642b091d -> 4f23d5cff


[LOG4J2-2327] java.util.ServiceConfigurationError:
org.apache.logging.log4j.util.PropertySource: Provider
org.apache.logging.log4j.util.EnvironmentPropertySource not a subtype.

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

Branch: refs/heads/release-2.x
Commit: 4f23d5cff3874f1c2771c34eeef31bd8ab3e5968
Parents: b642b09
Author: Gary Gregory <gg...@apache.org>
Authored: Thu Apr 26 11:53:32 2018 -0400
Committer: Gary Gregory <gg...@apache.org>
Committed: Thu Apr 26 11:53:32 2018 -0400

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


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4f23d5cf/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 f5e1ecb..c732b01 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,8 @@ public final class PropertiesUtil {
 
         private Environment(final PropertySource propertySource) {
             sources.add(propertySource);
-            for (final PropertySource source : ServiceLoader.load(PropertySource.class)) {
+            Class<PropertySource> serviceClass = PropertySource.class;
+            for (final PropertySource source : ServiceLoader.load(serviceClass, serviceClass.getClassLoader())) {
                 sources.add(source);
             }
             reload();

http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4f23d5cf/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 663cea9..32a7662 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -81,6 +81,9 @@
         MutableLogEvent references to other objects are cleared after each use.
         Fix a memory leak causing references to parameters to be held after synchronous logging with thread locals enabled.
       </action>
+      <action issue="LOG4J2-2327" dev="ggregory" type="fix" due-to="leor amikam">
+        java.util.ServiceConfigurationError: org.apache.logging.log4j.util.PropertySource: Provider org.apache.logging.log4j.util.EnvironmentPropertySource not a subtype.
+      </action>
     </release>
     <release version="2.11.0" date="2018-03-11" description="GA Release 2.11.0">
       <action issue="LOG4J2-2104" dev="rgoers" type="fix">