fixup! KTOR-7479 Use TypeInfo and typeOfOrNull in AttributeKey

ktorio · Oct 4, 2024 · 8f73aae · 8f73aae
1 parent 55a72a6
commit 8f73aae
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/...erver/ktor-server-core/common/src/io/ktor/server/response/ApplicationResponseFunctions.kt b/...erver/ktor-server-core/common/src/io/ktor/server/response/ApplicationResponseFunctions.kt
@@ -1,6 +1,6 @@
 /*
-* Copyright 2014-2021 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
-*/
+ * Copyright 2014-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ */
 
 @file:Suppress("unused")
 
@@ -22,17 +22,15 @@ import kotlin.jvm.*
  * @see [io.ktor.server.response.ApplicationResponse]
  */
 public suspend inline fun <reified T : Any> ApplicationCall.respond(message: T) {
-    // KT-42913
-    respond(message, runCatching { typeInfo<T>() }.getOrNull())
+    respond(message, typeInfo<T>())
 }
 
 /**
  * Sends a [message] as a response.
  * @see [io.ktor.server.response.ApplicationResponse]
  */
 public suspend inline fun <reified T> ApplicationCall.respondNullable(message: T) {
-    // KT-42913
-    respond(message, runCatching { typeInfo<T>() }.getOrNull())
+    respond(message, typeInfo<T>())
 }
 
 /**

diff --git a/ktor-utils/common/src/io/ktor/util/reflect/Type.kt b/ktor-utils/common/src/io/ktor/util/reflect/Type.kt
@@ -39,7 +39,11 @@ public class TypeInfo(
         if (this === other) return true
         if (other !is TypeInfo) return false
 
-        return if (kotlinType != null) kotlinType == other.kotlinType else type == other.type
+        return if (kotlinType != null || other.kotlinType != null) {
+            kotlinType == other.kotlinType
+        } else {
+            type == other.type
+        }
     }
 
     override fun toString(): String = "TypeInfo(${kotlinType ?: type})"