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

an explicit { HOME : null } should block lookup of ${HOME} in the environment.

Browse Source
This commit is contained in:
Havoc Pennington 2011-11-17 00:56:44 -05:00
parent 5f6f718566
commit 159bec9d03
2 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/typesafe/config/impl/ConfigSubstitution.java
View File

@ -99,10 +99,6 @@ final class ConfigSubstitution extends AbstractConfigValue implements
"peek or peekPath returned an unresolved substitution");
}
if (result != null && result.valueType() == ConfigValueType.NULL) {
result = null;
}
return result;
}

23
src/test/scala/com/typesafe/config/impl/ConfigSubstitutionTest.scala
View File

@ -5,6 +5,7 @@ import org.junit._
import com.typesafe.config.ConfigValue
import com.typesafe.config.ConfigException
import com.typesafe.config.ConfigResolveOptions
import com.typesafe.config.Config
class ConfigSubstitutionTest extends TestUtils {
@ -294,6 +295,28 @@ class ConfigSubstitutionTest extends TestUtils {
}
}
@Test
def noFallbackToEnvIfValuesAreNull() {
import scala.collection.JavaConverters._
// create a fallback object with all the env var names
// set to null. we want to be sure this blocks
// lookup in the environment. i.e. if there is a
// { HOME : null } then ${HOME} should be null.
val nullsMap = new java.util.HashMap[String, Object]
for (k <- substEnvVarObject.keySet().asScala) {
nullsMap.put(k.toUpperCase(), null);
}
val nulls = Config.fromMap(nullsMap, "nulls map")
val resolved = resolve(substEnvVarObject.withFallback(nulls))
for (k <- resolved.keySet().asScala) {
assertNotNull(resolved.get(k))
assertEquals(nullValue, resolved.get(k))
}
}
@Test
def fallbackToEnvWhenRelativized() {
import scala.collection.JavaConverters._