Make inlined schema derivation null safe (#3977)

softwaremill · Aug 7, 2024 · d90e319 · d90e319
1 parent a35ed84
commit d90e319
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/core/src/main/scala-3/sttp/tapir/generic/auto/SchemaMagnoliaDerivation.scala b/core/src/main/scala-3/sttp/tapir/generic/auto/SchemaMagnoliaDerivation.scala
@@ -119,14 +119,14 @@ trait SchemaMagnoliaDerivation {
         */
       private def withCache[T](typeName: TypeInfo, annotations: Seq[Any])(f: => Schema[T]): Schema[T] = {
         val cacheKey = typeName.full
-        val inProgressOrNull = deriveCache.get()
+        val inProgressOrNull: mutable.Set[String] | Null = deriveCache.get()
         val newCache = inProgressOrNull == null
 
-        val inProgress = if (inProgressOrNull == null) {
+        val inProgress = if (newCache) {
           val newInProgress = mutable.Set[String]()
           deriveCache.set(newInProgress)
           newInProgress
-        } else inProgressOrNull
+        } else inProgressOrNull.nn
 
         if (inProgress.contains(cacheKey)) {
           Schema[T](SRef(typeNameToSchemaName(typeName, annotations)))