From 0340381357415f828ccfa9b6fbea5ade84339395 Mon Sep 17 00:00:00 2001 From: DBotThePony Date: Sat, 16 Mar 2024 23:11:34 +0700 Subject: [PATCH] Fix either type adapter not consuming peeked null --- gradle.properties | 2 +- .../kotlin/ru/dbotthepony/kommons/gson/EitherTypeAdapter.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 50ea8c6..ebaa3f7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ kotlin.code.style=official specifyKotlinAsDependency=false projectGroup=ru.dbotthepony.kommons -projectVersion=2.9.19 +projectVersion=2.9.20 guavaDepVersion=33.0.0 gsonDepVersion=2.8.9 diff --git a/gson/src/main/kotlin/ru/dbotthepony/kommons/gson/EitherTypeAdapter.kt b/gson/src/main/kotlin/ru/dbotthepony/kommons/gson/EitherTypeAdapter.kt index 4ebc812..f0f7109 100644 --- a/gson/src/main/kotlin/ru/dbotthepony/kommons/gson/EitherTypeAdapter.kt +++ b/gson/src/main/kotlin/ru/dbotthepony/kommons/gson/EitherTypeAdapter.kt @@ -32,7 +32,7 @@ object EitherTypeAdapter : TypeAdapterFactory { } override fun read(`in`: JsonReader): Either? { - if (`in`.peek() == JsonToken.NULL) + if (`in`.consumeNull()) return null val elem = elemAdapter.read(`in`)