CBOR: get labels only when preferred over serial names

Kotlin · Jul 2, 2024 · 2439e5e · 2439e5e
1 parent 13e2eb0
commit 2439e5e
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/formats/cbor/commonMain/src/kotlinx/serialization/cbor/internal/Encoder.kt b/formats/cbor/commonMain/src/kotlinx/serialization/cbor/internal/Encoder.kt
@@ -120,15 +120,15 @@ internal sealed class CborWriter(
         encodeByteArrayAsByteString = descriptor.isByteString(index)
 
         val name = descriptor.getElementName(index)
-        val label = descriptor.getCborLabel(index)
+
 
         if (!descriptor.hasArrayTag()) {
             if (cbor.writeKeyTags) descriptor.getKeyTags(index)?.forEach { destination.encodeTag(it) }
 
             if ((descriptor.kind !is StructureKind.LIST) && (descriptor.kind !is StructureKind.MAP) && (descriptor.kind !is PolymorphicKind)) {
                 //indices are put into the name field. we don't want to write those, as it would result in double writes
-                if (cbor.preferCborLabelsOverNames && label != null) {
-                    destination.encodeNumber(label)
+                if (cbor.preferCborLabelsOverNames) {
+                    descriptor.getCborLabel(index)?.let { destination.encodeNumber(it) }
                 } else {
                     destination.encodeString(name)
                 }