From 46f323aff0107f4455d455ee9bf60c6c95d6d1e6 Mon Sep 17 00:00:00 2001 From: Alen Turkovic Date: Fri, 18 Sep 2020 18:50:39 +0200 Subject: [PATCH] Unmapped polymorphic elements will no longer be added to collections as nulls --- pom.xml | 2 +- .../java/com/github/alturkovic/asn/decoder/BerDecoder.java | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 769aa35..bc8625a 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.github.alturkovic asn-parser - 1.4.0 + 1.4.1 asn-parser ASN.1 Decoding/Encoding diff --git a/src/main/java/com/github/alturkovic/asn/decoder/BerDecoder.java b/src/main/java/com/github/alturkovic/asn/decoder/BerDecoder.java index 685b337..6977914 100644 --- a/src/main/java/com/github/alturkovic/asn/decoder/BerDecoder.java +++ b/src/main/java/com/github/alturkovic/asn/decoder/BerDecoder.java @@ -157,7 +157,10 @@ private void decodeCollection(final Collection collection, final byte[] collection.add(decodePolymorphic(asnClassDescription, elementBerData.toTlv())); } else if (taggedField.getElementTag().equals(parsedElementTag)) { if (taggedField.isStructured()) { - collection.add(decodeStructure(taggedField.getType(), elementBerData.toTlv())); + final Object decoded = decodeStructure(taggedField.getType(), elementBerData.toTlv()); + if (decoded != null) { + collection.add(decoded); + } } else { //noinspection unchecked final var asnConverter = loadAsnConverterFromCache((Class>) taggedField.getConverter());