Handle nulls more explicitly in schema derivation (#3970)

softwaremill · Aug 6, 2024 · faa2566 · faa2566
1 parent ef22dd9
commit faa2566
Showing 1 changed file with 8 additions and 6 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,12 +119,14 @@ trait SchemaMagnoliaDerivation {
         */
       private def withCache[T](typeName: TypeInfo, annotations: Seq[Any])(f: => Schema[T]): Schema[T] = {
         val cacheKey = typeName.full
-        var inProgress = deriveCache.get()
-        val newCache = inProgress == null
-        if (newCache) {
-          inProgress = mutable.Set[String]()
-          deriveCache.set(inProgress)
-        }
+        val inProgressOrNull = deriveCache.get()
+        val newCache = inProgressOrNull == null
+
+        val inProgress = if (inProgressOrNull == null) {
+          val newInProgress = mutable.Set[String]()
+          deriveCache.set(newInProgress)
+          newInProgress
+        } else inProgressOrNull
 
         if (inProgress.contains(cacheKey)) {
           Schema[T](SRef(typeNameToSchemaName(typeName, annotations)))