fix scala collection serializer

apache · Jan 5, 2024 · d90bec7 · d90bec7
1 parent 708b48c
commit d90bec7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/scala/src/main/scala/org/apache/fury/serializer/scala/CollectionSerializer.scala b/scala/src/main/scala/org/apache/fury/serializer/scala/CollectionSerializer.scala
@@ -49,12 +49,14 @@ abstract class AbstractScalaCollectionSerializer[A, T <: Iterable[A]](fury: Fury
 
   override def read(buffer: MemoryBuffer): T = {
     val collection = newCollection(buffer)
+    val numElements = getAndClearNumElements()
     if (numElements != 0) readElements(fury, buffer, collection, numElements)
     onCollectionRead(collection)
   }
 
   override def newCollection(buffer: MemoryBuffer): util.Collection[_] = {
-    numElements = buffer.readPositiveVarInt()
+    val numElements = buffer.readPositiveVarInt()
+    setNumElements(numElements)
     val factory = fury.readRef(buffer).asInstanceOf[Factory[A, T]]
     val builder = factory.newBuilder
     builder.sizeHint(numElements)

diff --git a/scala/src/main/scala/org/apache/fury/serializer/scala/MapSerializer.scala b/scala/src/main/scala/org/apache/fury/serializer/scala/MapSerializer.scala
@@ -50,12 +50,14 @@ abstract class AbstractScalaMapSerializer[K, V, T](fury: Fury, cls: Class[T])
 
   override def read(buffer: MemoryBuffer): T = {
     val map = newMap(buffer)
-    if (this.numElements != 0) readElements(buffer, numElements, map)
+    val numElements = getAndClearNumElements()
+    if (numElements != 0) readElements(buffer, numElements, map)
     onMapRead(map)
   }
 
   override def newMap(buffer: MemoryBuffer): util.Map[_, _] = {
-    numElements = buffer.readPositiveVarInt()
+    val numElements = buffer.readPositiveVarInt()
+    setNumElements(numElements)
     val factory = fury.readRef(buffer).asInstanceOf[Factory[(K, V), T]]
     val builder = factory.newBuilder
     builder.sizeHint(numElements)