!cdd #17770 Use self recursive type in AbstractReplicatedData (Java API)

* complete the TwoPhaseSet java sample with serialization
2015-07-02 12:12:34 +02:00 · 2015-07-02 12:12:34 +02:00 · da07a2e68e
commit da07a2e68e
parent 49e6e7f38c
9 changed files with 315 additions and 26 deletions
--- a/akka-docs/rst/scala/code/docs/ddata/TwoPhaseSet.scala
+++ b/akka-docs/rst/scala/code/docs/ddata/TwoPhaseSet.scala
@ -23,7 +23,7 @@ case class TwoPhaseSet(

  override def merge(that: TwoPhaseSet): TwoPhaseSet =
    copy(
-      adds = GSet(this.adds.elements ++ that.adds.elements),
-      removals = GSet(this.removals.elements ++ that.removals.elements))
+      adds = this.adds.merge(that.adds),
+      removals = this.removals.merge(that.removals))
 }
 //#twophaseset