From 67699ecf00b1dfb0f569592ed3250de822b8acb8 Mon Sep 17 00:00:00 2001 From: Rob Austin Date: Fri, 26 Sep 2014 17:19:00 +0100 Subject: [PATCH] HCOLL-134 ( release draft cut of the code so that I can test it across my network ) --- .../map/NodeDiscoveryHostPortBroadcaster.java | 4 +--- .../map/NodeDiscoveryHostPortBroadcasterTest.java | 12 +++++++++++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/main/java/net/openhft/chronicle/map/NodeDiscoveryHostPortBroadcaster.java b/src/main/java/net/openhft/chronicle/map/NodeDiscoveryHostPortBroadcaster.java index 0fd0a9425..5efef4edb 100644 --- a/src/main/java/net/openhft/chronicle/map/NodeDiscoveryHostPortBroadcaster.java +++ b/src/main/java/net/openhft/chronicle/map/NodeDiscoveryHostPortBroadcaster.java @@ -294,8 +294,6 @@ class BytesExternalizableImpl implements BytesExternalizable { this.allNodes = allNodes; } - private final AtomicBoolean modificationsComplete = new AtomicBoolean(true); - /** * this is used to tell nodes that are connecting to us which host and ports are in our grid, along with * all the identifiers. @@ -465,7 +463,7 @@ class BytesExternalizableImpl implements BytesExternalizable { @NotNull final ATSDirectBitSet destination) { - // merges the two bit-sets together via 'or' + // merges the two bit-sets together for (int i = (int) source.nextSetBit(0); i > 0; i = (int) source.nextSetBit(i + 1)) { try { diff --git a/src/test/java/net/openhft/chronicle/map/NodeDiscoveryHostPortBroadcasterTest.java b/src/test/java/net/openhft/chronicle/map/NodeDiscoveryHostPortBroadcasterTest.java index 69daa8fa5..847b9d6e3 100644 --- a/src/test/java/net/openhft/chronicle/map/NodeDiscoveryHostPortBroadcasterTest.java +++ b/src/test/java/net/openhft/chronicle/map/NodeDiscoveryHostPortBroadcasterTest.java @@ -37,12 +37,22 @@ public class NodeDiscoveryHostPortBroadcasterTest extends TestCase { externalizable.add(new InetSocketAddress("myhost", 8888)); externalizable.add(new InetSocketAddress("myOtherHost", 8888)); + externalizable.add((byte) 2); + externalizable.onChange(); + Thread.sleep(10000); externalizable.add((byte) 2); - externalizable.add((byte) 2); + externalizable.onChange(); + Thread.sleep(10000); externalizable.add((byte) 3); + externalizable.onChange(); + Thread.sleep(10000); externalizable.add((byte) 4); + externalizable.onChange(); + Thread.sleep(10000); externalizable.add((byte) 1); externalizable.onChange(); + Thread.sleep(10000); + externalizable.onChange(); Thread.sleep(1000); }