ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-26 08:01:09 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

CORDA-2871: Sanity fixes! (#63)

Browse Source 
* Improve message for SandboxClassLoadingException.
* Fix serialisation API for using sandboxed environment.
This commit is contained in:
Chris Rankin 2019-09-09 18:14:33 +01:00 committed by GitHub
parent f68c4b3308
commit 7a6c18156c
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/kotlin/net/corda/djvm/serialization/Serialization.kt
View File

@ -75,11 +75,17 @@ inline fun <reified T : Any> SerializedBytes<T>.deserializeFor(classLoader: Sand
} }
fun ByteSequence.deserializeTo(clazz: Class<*>, classLoader: SandboxClassLoader): Any { fun ByteSequence.deserializeTo(clazz: Class<*>, classLoader: SandboxClassLoader): Any {
return deserializeTo(clazz, classLoader, SerializationFactory.defaultFactory) val factory = SerializationFactory.defaultFactory
return deserializeTo(clazz, classLoader, factory, factory.defaultContext)
} }
fun ByteSequence.deserializeTo(clazz: Class<*>, classLoader: SandboxClassLoader, factory: SerializationFactory): Any { fun ByteSequence.deserializeTo(
val obj = factory.deserialize(this, Any::class.java, factory.defaultContext) clazz: Class<*>,
classLoader: SandboxClassLoader,
factory: SerializationFactory,
context: SerializationContext
): Any {
val obj = factory.deserialize(this, Any::class.java, context)
return if (clazz.isInstance(obj)) { return if (clazz.isInstance(obj)) {
obj obj
} else { } else {