From d1d1d2daff73fb8dcfee8e650c0519a01d159ba5 Mon Sep 17 00:00:00 2001
From: rob <rob.austin@boundedbuffer.com>
Date: Wed, 14 Oct 2015 10:46:58 +0100
Subject: [PATCH] HCOLL-403 removed another filter that was preventing all the
 message to be sent ( from all the nodes on bootstrap )

---
 .../chronicle/map/ReplicatedChronicleMap.java        |  5 +----
 .../map/TCPSocketReplicationAfterNodeFailure.java    | 12 ++++++++++--
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java b/src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java
index 3e44836e1..258f77526 100644
--- a/src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java
+++ b/src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java
@@ -667,10 +667,7 @@ final class ReplicatedChronicleMap<K, KI, MKI extends MetaBytesInterop<K, ? supe
         final long timeStamp = entry.readLong();
 
         final byte identifier = entry.readByte();
-        if (identifier != localIdentifier) {
-            // although unlikely, this may occur if the entry has been updated
-            return;
-        }
+
 
         final boolean isDeleted = entry.readBoolean();
         long valueSize;
diff --git a/src/test/java/net/openhft/chronicle/map/TCPSocketReplicationAfterNodeFailure.java b/src/test/java/net/openhft/chronicle/map/TCPSocketReplicationAfterNodeFailure.java
index d8090512f..f3d705acd 100644
--- a/src/test/java/net/openhft/chronicle/map/TCPSocketReplicationAfterNodeFailure.java
+++ b/src/test/java/net/openhft/chronicle/map/TCPSocketReplicationAfterNodeFailure.java
@@ -72,6 +72,7 @@ public class TCPSocketReplicationAfterNodeFailure {
 
             TcpTransportAndNetworkConfig tcpConfig = TcpTransportAndNetworkConfig
                     .of(8021)
+                    .name("peter") // naming the config helps with debugging
                     .heartBeatInterval(1, TimeUnit.SECONDS);
 
             hubOnServer1 = ReplicationHub.builder()
@@ -105,7 +106,9 @@ public class TCPSocketReplicationAfterNodeFailure {
             byte identifier = (byte) 2;
 
             TcpTransportAndNetworkConfig tcpConfig = TcpTransportAndNetworkConfig
-                    .of(8022, new InetSocketAddress("localhost", 8021)).heartBeatInterval(1, TimeUnit.SECONDS);
+                    .of(8022, new InetSocketAddress("localhost", 8021))
+                    .name("rob").
+                            heartBeatInterval(1, TimeUnit.SECONDS);
 
             hubOnServer2 = ReplicationHub.builder()
                     .tcpTransportAndNetwork(tcpConfig)
@@ -142,7 +145,11 @@ public class TCPSocketReplicationAfterNodeFailure {
             byte identifier = (byte) 3;
 
             TcpTransportAndNetworkConfig tcpConfig = TcpTransportAndNetworkConfig
-                    .of(8023, new InetSocketAddress("localhost", 8021)).heartBeatInterval(1, TimeUnit.SECONDS);
+                    .of(8023,
+                            new InetSocketAddress("localhost", 8021),
+                            new InetSocketAddress("localhost", 8022)) // this wont be available but just added for completeness
+                    .name("ozan").
+                            heartBeatInterval(1, TimeUnit.SECONDS);
 
             hubOnServer3 = ReplicationHub.builder()
                     .tcpTransportAndNetwork(tcpConfig)
@@ -165,6 +172,7 @@ public class TCPSocketReplicationAfterNodeFailure {
         assertEquals(3, favoriteComputerServer1.size());
 
         favoriteComputerServer1.close();
+        favoriteComputerServer3.close();
     }