From fe4b2001420c80b12cea16a903bc654e88c16eb7 Mon Sep 17 00:00:00 2001 From: leventov Date: Fri, 2 Oct 2015 02:45:38 +0300 Subject: [PATCH] added connection listener check --- src/main/java/net/openhft/chronicle/map/TcpReplicator.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/openhft/chronicle/map/TcpReplicator.java b/src/main/java/net/openhft/chronicle/map/TcpReplicator.java index 57c8a4b4d..3547157b0 100644 --- a/src/main/java/net/openhft/chronicle/map/TcpReplicator.java +++ b/src/main/java/net/openhft/chronicle/map/TcpReplicator.java @@ -394,8 +394,7 @@ public final class TcpReplicator extends AbstractChannelReplicator impleme if (LOG.isDebugEnabled()) LOG.debug("", e); - // null check (Attached)key.attachment(); - if (key.channel() != null && key.attachment() != null) + if (key.channel() != null && key.attachment() != null && connectionListener != null) connectionListener.onDisconnect(((SocketChannel) key.channel()).socket().getInetAddress(), ((Attached) key.attachment()).remoteIdentifier); @@ -589,7 +588,7 @@ public final class TcpReplicator extends AbstractChannelReplicator impleme attached.remoteIdentifier = remoteIdentifier; final SocketChannel channel = (SocketChannel) key.channel(); - if (channel != null && channel.socket() != null) { + if (channel != null && channel.socket() != null && connectionListener != null) { connectionListener.onConnect(channel.socket().getInetAddress(), attached.remoteIdentifier, attached.isServer); }