Merge remote-tracking branch 'remotes/open/master' into merges/may-21-17-24

# Conflicts:
#	client/rpc/src/main/kotlin/net/corda/client/rpc/PermissionException.kt
This commit is contained in:
sollecitom
2018-05-22 09:51:02 +01:00
11 changed files with 49 additions and 19 deletions

View File

@ -14,6 +14,7 @@ import net.corda.core.CordaRuntimeException
import net.corda.core.crypto.SecureHash
import net.corda.core.ClientRelevantError
import net.corda.core.flows.IdentifiableException
import net.corda.core.serialization.CordaSerializable
/**
* Thrown to indicate that an attachment was already uploaded to a Corda node.
@ -56,4 +57,11 @@ class OutdatedNetworkParameterHashException(old: SecureHash, new: SecureHash) :
/**
* Thrown to indicate that the command was rejected by the node, typically due to a special temporary mode.
*/
class RejectedCommandException(message: String) : CordaRuntimeException(message), ClientRelevantError
class RejectedCommandException(message: String) : CordaRuntimeException(message), ClientRelevantError
/**
* Allows an implementing [Throwable] to be propagated to RPC clients.
*/
@Deprecated("Use ClientRelevantError instead.", replaceWith = ReplaceWith("ClientRelevantError"))
@CordaSerializable
interface RpcSerializableError