fix issue with vvector handling in ORSet.mergeRemoveDelta #22890

2017-09-25 16:16:20 +02:00 · 2017-09-25 16:16:20 +02:00 · 9d7b81f11c
commit 9d7b81f11c
parent 12196d674e
2 changed files with 16 additions and 1 deletions
--- a/akka-distributed-data/src/main/scala/akka/cluster/ddata/ORSet.scala
+++ b/akka-distributed-data/src/main/scala/akka/cluster/ddata/ORSet.scala
@ -463,7 +463,8 @@ final class ORSet[A] private[akka] (
        elementsMap
    }
    clearAncestor()
-    val newVvector = vvector.merge(that.vvector)
+
+    val newVvector = vvector.merge(thatDot)
    new ORSet(newElementsMap, newVvector)
  }