Skip to content

Commit f2f4bcf

Browse files
committed
cleaned up Reachability
1 parent 83c2205 commit f2f4bcf

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

src/core/Akka.Cluster/Reachability.cs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ public enum ReachabilityStatus
5555
public static readonly Reachability Empty =
5656
new Reachability(ImmutableList.Create<Record>(), ImmutableDictionary.Create<UniqueAddress, long>());
5757

58-
//TODO: Serialization should ignore
5958
private readonly Lazy<Cache> _cache;
6059

6160
/// <summary>
@@ -80,11 +79,6 @@ public Reachability(ImmutableList<Record> records, ImmutableDictionary<UniqueAdd
8079
/// </summary>
8180
public ImmutableDictionary<UniqueAddress, long> Versions { get; }
8281

83-
/*
84-
* def isReachable(observer: UniqueAddress, subject: UniqueAddress): Boolean =
85-
status(observer, subject) == Reachable
86-
*/
87-
8882
/// <summary>
8983
/// TBD
9084
/// </summary>
@@ -223,6 +217,9 @@ public Reachability Merge(IImmutableSet<UniqueAddress> allowed, Reachability oth
223217
var rows1 = ObserverRows(observer);
224218
var rows2 = other.ObserverRows(observer);
225219

220+
if (rows1 == null && rows2 == null)
221+
continue;
222+
226223
if (rows1 != null && rows2 != null)
227224
{
228225
var rows = observerVersion1 > observerVersion2 ? rows1 : rows2;

0 commit comments

Comments
 (0)