From e8d6701f8720d61a4fd8a70b8f959782be8574fe Mon Sep 17 00:00:00 2001 From: Ryan Fowler Date: Mon, 27 Jan 2020 15:23:07 +0000 Subject: [PATCH] CORDA-3558: Allow initial registration errors to propagate up so the node exits with a failure code (#5899) --- .../node/internal/subcommands/InitialRegistrationCli.kt | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/node/src/main/kotlin/net/corda/node/internal/subcommands/InitialRegistrationCli.kt b/node/src/main/kotlin/net/corda/node/internal/subcommands/InitialRegistrationCli.kt index aba374e7ae..236d4d584c 100644 --- a/node/src/main/kotlin/net/corda/node/internal/subcommands/InitialRegistrationCli.kt +++ b/node/src/main/kotlin/net/corda/node/internal/subcommands/InitialRegistrationCli.kt @@ -86,12 +86,10 @@ class InitialRegistration(val baseDirectory: Path, private val networkRootTrustS private fun initialRegistration(config: NodeConfiguration) { // Null checks for [compatibilityZoneURL], [rootTruststorePath] and // [rootTruststorePassword] have been done in [CmdLineOptions.loadConfig] - val result = attempt { registerWithNetwork(config) }.doOnFailure(Consumer(this::handleRegistrationError)) + attempt { registerWithNetwork(config) }.doOnFailure(Consumer(this::handleRegistrationError)).getOrThrow() - if (result.isSuccess) { - // At this point the node registration was successful. We can delete the marker file. - deleteNodeRegistrationMarker(baseDirectory) - } + // At this point the node registration was successful. We can delete the marker file. + deleteNodeRegistrationMarker(baseDirectory) } private fun deleteNodeRegistrationMarker(baseDir: Path) {