Repository: incubator-tamaya-extensions Updated Branches: refs/heads/master 2f124694a -> 0f772ca02
[TAMAYA-244] Fixed a bug in EnrichedConfiguration. Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/commit/0f772ca0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/tree/0f772ca0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/diff/0f772ca0 Branch: refs/heads/master Commit: 0f772ca02c6566081df0681f17fdc09a799acebe Parents: 2f12469 Author: Oliver B. Fischer <[email protected]> Authored: Tue Mar 21 23:35:39 2017 +0100 Committer: Oliver B. Fischer <[email protected]> Committed: Tue Mar 21 23:35:39 2017 +0100 ---------------------------------------------------------------------- .../java/org/apache/tamaya/functions/EnrichedConfiguration.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-tamaya-extensions/blob/0f772ca0/modules/functions/src/main/java/org/apache/tamaya/functions/EnrichedConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/functions/src/main/java/org/apache/tamaya/functions/EnrichedConfiguration.java b/modules/functions/src/main/java/org/apache/tamaya/functions/EnrichedConfiguration.java index 7969563..7ace497 100644 --- a/modules/functions/src/main/java/org/apache/tamaya/functions/EnrichedConfiguration.java +++ b/modules/functions/src/main/java/org/apache/tamaya/functions/EnrichedConfiguration.java @@ -48,7 +48,7 @@ class EnrichedConfiguration implements Configuration { */ EnrichedConfiguration(Configuration configuration, Map<String, Object> properties, boolean overriding) { this.baseConfiguration = Objects.requireNonNull(configuration); - this.addedProperties.putAll(addedProperties); + this.addedProperties.putAll(properties); this.overriding = overriding; }
