From 3ea78ae745d70ab0392988cbd5c7ef3bf3a5af86 Mon Sep 17 00:00:00 2001 From: Roman Golyshev Date: Thu, 25 Aug 2022 12:18:44 +0200 Subject: [PATCH] Revert some changes from 3042a80f Too many places right now depend on `KotlinClassHeader.data` and `KotlinClassHeader.strings` being saved even if empty, and not being null See KT-39492 --- .../header/ReadKotlinClassHeaderAnnotationVisitor.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/header/ReadKotlinClassHeaderAnnotationVisitor.java b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/header/ReadKotlinClassHeaderAnnotationVisitor.java index f0187c4ee27..c8aee757989 100644 --- a/core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/header/ReadKotlinClassHeaderAnnotationVisitor.java +++ b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/header/ReadKotlinClassHeaderAnnotationVisitor.java @@ -200,9 +200,7 @@ public class ReadKotlinClassHeaderAnnotationVisitor implements AnnotationVisitor return new CollectStringArrayAnnotationVisitor() { @Override protected void visitEnd(@NotNull String[] result) { - if (result.length > 0) { - data = result; - } + data = result; } }; } @@ -212,9 +210,7 @@ public class ReadKotlinClassHeaderAnnotationVisitor implements AnnotationVisitor return new CollectStringArrayAnnotationVisitor() { @Override protected void visitEnd(@NotNull String[] result) { - if (result.length > 0) { - strings = result; - } + strings = result; } }; }