Repository: logging-log4j2 Updated Branches: refs/heads/master 6096c8630 -> 7cb073981
Revert "[LOG4J2-2327] java.util.ServiceConfigurationError: org.apache.logging.log4j.util.PropertySource: Provider org.apache.logging.log4j.util.EnvironmentPropertySource not a subtype." This reverts commit 6096c863078e2a8ddd428921c1437ad77940c088. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/7cb07398 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/7cb07398 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/7cb07398 Branch: refs/heads/master Commit: 7cb07398149e5c2c77404251233cfcabd57925e5 Parents: 6096c86 Author: Gary Gregory <ggreg...@apache.org> Authored: Thu Apr 26 14:38:31 2018 -0400 Committer: Gary Gregory <ggreg...@apache.org> Committed: Thu Apr 26 14:38:31 2018 -0400 ---------------------------------------------------------------------- .../java/org/apache/logging/log4j/util/PropertiesUtil.java | 3 +-- src/changes/changes.xml | 6 ------ 2 files changed, 1 insertion(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7cb07398/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 c732b01..f5e1ecb 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,8 +316,7 @@ public final class PropertiesUtil { private Environment(final PropertySource propertySource) { sources.add(propertySource); - Class<PropertySource> serviceClass = PropertySource.class; - for (final PropertySource source : ServiceLoader.load(serviceClass, serviceClass.getClassLoader())) { + for (final PropertySource source : ServiceLoader.load(PropertySource.class)) { sources.add(source); } reload(); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7cb07398/src/changes/changes.xml ---------------------------------------------------------------------- diff --git a/src/changes/changes.xml b/src/changes/changes.xml index a6adbe5..921b8f6 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -159,9 +159,6 @@ 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.1" date="2018-MM-DD" description="GA Release 2.11.1"> <action issue="LOG4J2-2268" dev="rgoers" type="fix" due-to="Tilman Hausherr"> @@ -214,9 +211,6 @@ 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-xx-xx" description="GA Release 2.11.0"> <action issue="LOG4J2-2104" dev="rgoers" type="fix">
