From f4e13c78e9bd887cdbca33667486769f050b3d0a Mon Sep 17 00:00:00 2001 From: Rob Austin Date: Mon, 23 Feb 2015 09:58:28 +0000 Subject: [PATCH] HCOLL-309 added a return and now outputting the remote connection. Conflicts: src/main/java/net/openhft/chronicle/map/TcpReplicator.java --- .../net/openhft/chronicle/map/TcpReplicator.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/main/java/net/openhft/chronicle/map/TcpReplicator.java b/src/main/java/net/openhft/chronicle/map/TcpReplicator.java index c64a2eff5..c21d22591 100644 --- a/src/main/java/net/openhft/chronicle/map/TcpReplicator.java +++ b/src/main/java/net/openhft/chronicle/map/TcpReplicator.java @@ -653,19 +653,23 @@ public final class TcpReplicator extends AbstractChannelReplicator impleme attached.serverVersion = reader.readRemoteServerVersion(); } catch (IllegalStateException e1) { socketChannel.close(); + return; } if (attached.serverVersion == null) return; if (!isValidVersionNumber(attached.serverVersion)) { - LOG.warn("Please check that you don't have a third party system incorrectly " + - "connecting to ChronicleMap, " + - "Closing the remote connection as Chronicle can not make sense of the remote " + - "version number received from the external connection, " + - "version=" + attached.serverVersion + ", Chronicle is expecting the version " + - "number to only contain '.',A-Z,a-z,0-9"); + LOG.warn("Closing the remote connection : Please check that you don't have " + + "a third party system incorrectly connecting to ChronicleMap, " + + "remoteAddress=" + socketChannel.getRemoteAddress() + ", " + + "so closing the remote connection as Chronicle can not make sense " + + "of the remote version number received from the external connection, " + + "version=" + attached.serverVersion + ", " + + "Chronicle is expecting the version number to only contain " + + "'.','-', ,A-Z,a-z,0-9"); socketChannel.close(); + return; } checkVersions(attached);