From cbf727ae7ac9941fb6cdde28f927069e4dbae23a Mon Sep 17 00:00:00 2001 From: Rob Austin Date: Fri, 2 Jan 2015 17:49:27 +0000 Subject: [PATCH] HCOLL-290 possibly fixed - Reported NPE in net.openhft.chronicle.map.TcpReplicator#heartBeatMonitor --- src/main/java/net/openhft/chronicle/map/TcpReplicator.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/net/openhft/chronicle/map/TcpReplicator.java b/src/main/java/net/openhft/chronicle/map/TcpReplicator.java index 01bfb80aa..9a3eebdfe 100644 --- a/src/main/java/net/openhft/chronicle/map/TcpReplicator.java +++ b/src/main/java/net/openhft/chronicle/map/TcpReplicator.java @@ -300,6 +300,10 @@ final class TcpReplicator extends AbstractChannelReplicator implements Clo } final Attached attachment = (Attached) key.attachment(); + + if (attachment == null) + continue; + if (!attachment.hasRemoteHeartbeatInterval) continue;