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

fix merge

Browse Source
This commit is contained in:
Tudor Malene 2018-03-06 14:04:23 +00:00 committed by tudor.malene@gmail.com
parent 98a4fe1ce3
commit 549d271047
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
verify-enclave/src/main/kotlin/com/r3/enclaves/txverify/EnclaveletSerializationScheme.kt
View File

@ -6,7 +6,7 @@ import net.corda.core.serialization.internal.SerializationEnvironmentImpl
import net.corda.core.serialization.internal.nodeSerializationEnv import net.corda.core.serialization.internal.nodeSerializationEnv
import net.corda.core.utilities.toHexString import net.corda.core.utilities.toHexString
import net.corda.nodeapi.internal.serialization.CordaSerializationMagic import net.corda.nodeapi.internal.serialization.CordaSerializationMagic
import net.corda.nodeapi.internal.serialization.KRYO_P2P_CONTEXT import net.corda.nodeapi.internal.serialization.AMQP_P2P_CONTEXT
import net.corda.nodeapi.internal.serialization.SerializationFactoryImpl import net.corda.nodeapi.internal.serialization.SerializationFactoryImpl
import net.corda.nodeapi.internal.serialization.amqp.AbstractAMQPSerializationScheme import net.corda.nodeapi.internal.serialization.amqp.AbstractAMQPSerializationScheme
import net.corda.nodeapi.internal.serialization.amqp.SerializerFactory import net.corda.nodeapi.internal.serialization.amqp.SerializerFactory
@ -27,10 +27,10 @@ private class EnclaveletSerializationScheme {
registerScheme(AMQPVerifierSerializationScheme) registerScheme(AMQPVerifierSerializationScheme)
}, },
/** /**
* Even though default context is set to Kryo P2P, the encoding will be adjusted depending on the * Even though default context is set to Amqp P2P, the encoding will be adjusted depending on the
* incoming request received. * incoming request received.
*/ */
KRYO_P2P_CONTEXT) AMQP_P2P_CONTEXT)
/* /*
* Ensure that we initialise JAXP before blacklisting is enabled. * Ensure that we initialise JAXP before blacklisting is enabled.