ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-19 21:17:58 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

CORDA-2363 - Fix ClassNotFound handling (#5078) (#5107)

Browse Source 
(cherry picked from commit 25f335861b)
This commit is contained in:
Tudor Malene 2019-05-08 14:08:52 +01:00 committed by Katelyn Baker
parent 95b6cd1c6d
commit 67808d985e
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/src/main/kotlin/net/corda/core/transactions/TransactionBuilder.kt
View File

@ -27,6 +27,7 @@ import java.util.regex.Pattern
import kotlin.collections.ArrayList
import kotlin.collections.component1
import kotlin.collections.component2
import kotlin.reflect.KClass
/**
* A TransactionBuilder is a transaction class that's mutable (unlike the others which are all immutable). It is
@ -170,6 +171,13 @@ open class TransactionBuilder(
wireTx
}
// Returns the first exception in the hierarchy that matches one of the [types].
private tailrec fun Throwable.rootClassNotFoundCause(vararg types: KClass<*>): Throwable = when {
this::class in types -> this
this.cause == null -> this
else -> this.cause!!.rootClassNotFoundCause(*types)
}
/**
* @return true if a new dependency was successfully added.
*/
@ -179,7 +187,8 @@ open class TransactionBuilder(
// The transaction verified successfully without adding any extra dependency.
false
} catch (e: Throwable) {
val rootError = e.rootCause
val rootError = e.rootClassNotFoundCause(ClassNotFoundException::class, NoClassDefFoundError::class)
when {
// Handle various exceptions that can be thrown during verification and drill down the wrappings.
// Note: this is a best effort to preserve backwards compatibility.

10
serialization/src/main/kotlin/net/corda/serialization/internal/amqp/AMQPExceptions.kt
View File

@ -23,10 +23,12 @@ internal inline fun <T> ifThrowsAppend(strToAppendFn: () -> String, block: () ->
try {
return block()
} catch (th: Throwable) {
if (th is AMQPNotSerializableException) {
th.classHierarchy.add(strToAppendFn())
} else {
th.setMessage("${strToAppendFn()} -> ${th.message}")
when (th) {
is AMQPNotSerializableException -> th.classHierarchy.add(strToAppendFn())
// Do not overwrite the message of these exceptions as it may be used.
is ClassNotFoundException -> {}
is NoClassDefFoundError -> {}
else -> th.setMessage("${strToAppendFn()} -> ${th.message}")
}
throw th
}