raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

Merge seen table by starting with empty seen after merge, see #2077

Browse source
This commit is contained in:
Patrik Nordwall 2012-06-13 11:19:06 +02:00
parent ff5c99a80d
commit f3d9f9c4e8
2 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
akka-cluster/src/main/scala/akka/cluster/Cluster.scala
View file

@ -240,8 +240,8 @@ case class Gossip(
val mergedMembers = Gossip.emptyMembers ++ reduceHighestPriority(this.members.toSeq, that.members.toSeq).
filterNot(mergedUnreachable.contains)
// 5. merge seen (FIXME is this correct?)
val mergedSeen = this.overview.seen ++ that.overview.seen
// 5. fresh seen table
val mergedSeen = Map.empty[Address, VectorClock]
Gossip(GossipOverview(mergedSeen, mergedUnreachable), mergedMembers, mergedMeta, mergedVClock)
}