diff --git a/node/src/main/kotlin/net/corda/node/services/config/ConfigUtilities.kt b/node/src/main/kotlin/net/corda/node/services/config/ConfigUtilities.kt index b2dc5dd773..3f4eab0295 100644 --- a/node/src/main/kotlin/net/corda/node/services/config/ConfigUtilities.kt +++ b/node/src/main/kotlin/net/corda/node/services/config/ConfigUtilities.kt @@ -36,6 +36,7 @@ object ConfigHelper { private const val UPPERCASE_PROPERTY_PREFIX = "CORDA." private val log = LoggerFactory.getLogger(javaClass) + @Suppress("LongParameterList") fun loadConfig(baseDirectory: Path, configFile: Path = baseDirectory / "node.conf", allowMissingConfig: Boolean = false, @@ -88,7 +89,13 @@ object ConfigHelper { return ConfigFactory.parseMap( toProperties() .mapKeys { - var newKey = (it.key as String) + val original = it.key as String + + if (original == original.toUpperCase()){ + return@mapKeys original + } + + var newKey = original .replace('_', '.') .replace(UPPERCASE_PROPERTY_PREFIX, CORDA_PROPERTY_PREFIX) @@ -175,4 +182,4 @@ fun MutualSslConfiguration.configureDevKeyAndTrustStores(myLegalName: CordaX500N else -> throw IllegalArgumentException("CryptoService not supported.") } } -} \ No newline at end of file +}