ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-05-31 14:40:52 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix directory logic

Browse Source
This commit is contained in:
Matthew Nesbit 2016-08-03 10:17:44 +01:00
parent 244150d658
commit d32db5d08a
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/kotlin/com/r3corda/standalone/Main.kt
View File

@ -122,7 +122,9 @@ fun main(args: Array<String>) {
val appConfig = ConfigFactory.parseFile(configFile) val appConfig = ConfigFactory.parseFile(configFile)
val cmdlineOverrideMap = HashMap<String, Any?>() val cmdlineOverrideMap = HashMap<String, Any?>()
if (cmdlineOptions.has(ParamsSpec.baseDirectoryArg)) {
cmdlineOverrideMap.put("basedir", baseDirectoryPath.toString()) cmdlineOverrideMap.put("basedir", baseDirectoryPath.toString())
}
val overrideConfig = ConfigFactory.parseMap(cmdlineOverrideMap) val overrideConfig = ConfigFactory.parseMap(cmdlineOverrideMap)
val mergedAndResolvedConfig = overrideConfig.withFallback(appConfig).withFallback(defaultConfig).resolve() val mergedAndResolvedConfig = overrideConfig.withFallback(appConfig).withFallback(defaultConfig).resolve()