ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-02-21 01:42:24 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

CORDA-2996: NotaryLoader - improve exception handling (#5210)

Browse Source 
Ignore InvocationTargetException and only propagate the cause to avoid noise.
This commit is contained in:
Andrius Dagys 2019-06-27 15:33:38 +03:00 committed by Shams Asari
parent 51f1e442a3
commit c1542f386a
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
node/src/main/kotlin/net/corda/node/utilities/NotaryLoader.kt
View File

@ -13,6 +13,7 @@ import net.corda.node.services.config.NotaryConfig
import net.corda.node.services.transactions.SimpleNotaryService
import net.corda.notary.experimental.bftsmart.BFTSmartNotaryService
import net.corda.notary.experimental.raft.RaftNotaryService
import java.lang.reflect.InvocationTargetException
import java.security.PublicKey
class NotaryLoader(
@ -61,7 +62,7 @@ class NotaryLoader(
log.info("Starting notary service: $serviceClass")
val notaryKey = myNotaryIdentity?.owningKey
?: throw IllegalArgumentException("Unable to start notary service $serviceClass: notary identity not found")
?: throw IllegalArgumentException("Unable to start notary service: notary identity not found")
/** Some notary implementations only work with Java serialization. */
maybeInstallSerializationFilter(serviceClass)
@ -69,7 +70,12 @@ class NotaryLoader(
val constructor = serviceClass
.getDeclaredConstructor(ServiceHubInternal::class.java, PublicKey::class.java)
.apply { isAccessible = true }
return constructor.newInstance(services, notaryKey)
try {
return constructor.newInstance(services, notaryKey)
} catch (e: InvocationTargetException) {
log.error("Exception occurred when starting notary service")
throw e.cause ?: e
}
}
/** Validates that the notary is correctly configured by comparing the configured type against the type advertised in the network map cache */