Alawn/Chronicle-Map
1
0
Fork 0
mirror of https://github.com/OpenHFT/Chronicle-Map.git synced 2021-09-13 01:26:12 +00:00
Code Releases Activity

HCOLL-134 fix the cause of most broken tests, most of the issues were do to my recent silly mistake in TCPReplicator.

Browse Source
This commit is contained in:
Rob Austin
2014-10-03 08:19:14 +01:00
parent f996ba3177
commit cee70c82a0
2 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/net/openhft/chronicle/map/TcpReplicator.java
+2 -10
View File
@@ -424,16 +424,9 @@ class TcpReplicator extends AbstractChannelReplicator implements Closeable {
final IdentifierListener identifierListener = replicationConfig.identifierListener;
final SocketAddress remoteAddress = socketChannel.getRemoteAddress();
boolean identifierIsUnique;
if (identifierListener != null) {
identifierIsUnique = identifierListener.isIdentifierUnique(remoteIdentifier, remoteAddress);
} else {
identifierIsUnique = remoteIdentifier != localIdentifier;
}
if (identifierIsUnique) {
if ( (identifierListener != null && !identifierListener.isIdentifierUnique(remoteIdentifier,
remoteAddress)) || remoteIdentifier == localIdentifier)
// throwing this exception will cause us to disconnect, both the client and server
// will be able to detect the the remote and local identifiers are the same,
@@ -441,7 +434,6 @@ class TcpReplicator extends AbstractChannelReplicator implements Closeable {
// methods
throw new IllegalStateException("dropping connection, " +
"as the remote-identifier is already being used, identifier=" + remoteIdentifier);
}
attached.remoteModificationIterator = replica.acquireModificationIterator(remoteIdentifier,
attached);