ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-04-06 19:07:08 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

CORDA-540: Stop breaking PartyAndCertificate when persisting it in binary form (#1384)

Browse Source 
Breaking on multiple parts causes a problem in AMQP mode when X509 Certificate path cannot be serialized on its own
This commit is contained in:
Viktor Kolomeyko 2017-09-01 13:14:39 +01:00 committed by GitHub
parent 8ae09f1fb3
commit 6bc44b96f1
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/src/main/kotlin/net/corda/core/schemas/NodeInfoSchema.kt
View File

@ -8,7 +8,6 @@ import net.corda.core.serialization.serialize
import net.corda.core.utilities.NetworkHostAndPort
import net.corda.core.utilities.toBase58String
import java.io.Serializable
import java.security.cert.CertPath
import javax.persistence.*
object NodeInfoSchema
@ -107,13 +106,9 @@ object NodeInfoSchemaV1 : MappedSchema(
@Column(name = "party_name", nullable = false)
val name: String,
@Column(name = "certificate")
@Column(name = "party_cert_binary")
@Lob
val certificate: ByteArray,
@Column(name = "certificate_path")
@Lob
val certPath: ByteArray,
val partyCertBinary: ByteArray,
val isMain: Boolean,
@ -121,9 +116,10 @@ object NodeInfoSchemaV1 : MappedSchema(
private val persistentNodeInfos: Set<PersistentNodeInfo> = emptySet()
) {
constructor(partyAndCert: PartyAndCertificate, isMain: Boolean = false)
: this(partyAndCert.party.owningKey.toBase58String(), partyAndCert.party.name.toString(), partyAndCert.certificate.serialize().bytes, partyAndCert.certPath.serialize().bytes, isMain)
: this(partyAndCert.party.owningKey.toBase58String(), partyAndCert.party.name.toString(), partyAndCert.serialize().bytes, isMain)
fun toLegalIdentityAndCert(): PartyAndCertificate {
return PartyAndCertificate(certPath.deserialize<CertPath>())
return partyCertBinary.deserialize<PartyAndCertificate>()
}
}
}