github-repos/config
1
0
Fork 0
mirror of https://github.com/lightbend/config.git synced 2025-03-22 23:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

formatting

Browse Source
This commit is contained in:
Ryan O'Neill 2015-08-13 15:02:40 -07:00
parent 1ab4def03d
commit 2566973fdd
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config/src/main/java/com/typesafe/config/impl/SimpleConfigObject.java
View File

@ -418,8 +418,7 @@ final class SimpleConfigObject extends AbstractConfigObject implements Serializa
for (ConfigConditional cond: this.conditionals) { for (ConfigConditional cond: this.conditionals) {
SimpleConfigObject body = cond.resolve(context, sourceWithParent); SimpleConfigObject body = cond.resolve(context, sourceWithParent);
AbstractConfigObject resolvedBody = body.resolveSubstitutions(context, source).value; AbstractConfigObject resolvedBody = body.resolveSubstitutions(context, source).value;
// if (resolvedBody != SimpleConfigObject.empty()) value = value.mergedWithObject(resolvedBody);
value = value.mergedWithObject(resolvedBody);
} }
return ResolveResult.make(modifier.context, value).asObjectResult(); return ResolveResult.make(modifier.context, value).asObjectResult();