You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tamaya.apache.org by an...@apache.org on 2016/11/14 00:31:00 UTC
incubator-tamaya git commit: TAMAYA-182: Added additional methods for
loading defaults with the builder, bugfix also considering providers.
Repository: incubator-tamaya
Updated Branches:
refs/heads/master 57df9012d -> 3a05dfbed
TAMAYA-182: Added additional methods for loading defaults with the builder, bugfix also considering providers.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/3a05dfbe
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/3a05dfbe
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/3a05dfbe
Branch: refs/heads/master
Commit: 3a05dfbed7f0187cef43ece6ca0443ea18c6c8d7
Parents: 57df901
Author: anatole <an...@apache.org>
Authored: Mon Nov 14 01:30:54 2016 +0100
Committer: anatole <an...@apache.org>
Committed: Mon Nov 14 01:30:54 2016 +0100
----------------------------------------------------------------------
.../tamaya/core/internal/DefaultConfigurationContextBuilder.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/3a05dfbe/code/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfigurationContextBuilder.java
----------------------------------------------------------------------
diff --git a/code/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfigurationContextBuilder.java b/code/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfigurationContextBuilder.java
index e8c1ace..d9ee63b 100644
--- a/code/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfigurationContextBuilder.java
+++ b/code/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfigurationContextBuilder.java
@@ -134,6 +134,10 @@ public class DefaultConfigurationContextBuilder implements ConfigurationContextB
checkBuilderState();
List<PropertySource> propertySources = new ArrayList<>();
propertySources.addAll(ServiceContextManager.getServiceContext().getServices(PropertySource.class));
+ for(PropertySourceProvider provider:
+ ServiceContextManager.getServiceContext().getServices(PropertySourceProvider.class)){
+ propertySources.addAll(provider.getPropertySources());
+ }
Collections.sort(propertySources, DEFAULT_PROPERTYSOURCE_COMPARATOR);
return addPropertySources(propertySources);
}