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

CORDA-539 - Fix for attempting to create a primitive nullable field

Browse Source 
Refactoring meant that the secondary constructor wasn't being called any
more and thus the check wasn't being made. Originally, we always
created copies of fields when constructing a schema which meant we always
called the secondary constructor, now we don't
This commit is contained in:
Katelyn Baker
2017-09-13 10:35:59 +01:00
parent 063771fac4
commit ef409c4d65
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
node-api/src/main/kotlin/net/corda/nodeapi/internal/serialization/carpenter/SchemaFields.kt
View File

@ -4,8 +4,6 @@ import jdk.internal.org.objectweb.asm.Opcodes.*
import org.objectweb.asm.ClassWriter import org.objectweb.asm.ClassWriter
import org.objectweb.asm.MethodVisitor import org.objectweb.asm.MethodVisitor
import org.objectweb.asm.Type import org.objectweb.asm.Type
import java.beans.BeanDescriptor
import java.util.*
abstract class Field(val field: Class<out Any?>) { abstract class Field(val field: Class<out Any?>) {
abstract var descriptor: String? abstract var descriptor: String?
@ -95,12 +93,14 @@ class NullableField(field: Class<out Any?>) : ClassField(field) {
override val nullabilityAnnotation = "Ljavax/annotation/Nullable;" override val nullabilityAnnotation = "Ljavax/annotation/Nullable;"
constructor(name: String, field: Class<out Any?>) : this(field) { constructor(name: String, field: Class<out Any?>) : this(field) {
this.name = name
}
init {
if (field.isPrimitive) { if (field.isPrimitive) {
throw NullablePrimitiveException( throw NullablePrimitiveException(
"Field $name is primitive type ${Type.getDescriptor(field)} and thus cannot be nullable") "Field $name is primitive type ${Type.getDescriptor(field)} and thus cannot be nullable")
} }
this.name = name
} }
override fun nullTest(mv: MethodVisitor, slot: Int) { override fun nullTest(mv: MethodVisitor, slot: Int) {