From ed6611b5cc3dc4f95b1014070af06ffc5a28f4e0 Mon Sep 17 00:00:00 2001 From: Rob Austin Date: Tue, 11 Nov 2014 14:33:05 +0000 Subject: [PATCH] HCOLL-200 removed trace code --- .../openhft/chronicle/map/ReplicatedChronicleMap.java | 11 ----------- .../chronicle/map/TCPSocketReplicationNativeTest.java | 7 ++----- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java b/src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java index d21e669b1..6d82740d9 100644 --- a/src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java +++ b/src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java @@ -443,8 +443,6 @@ final class ReplicatedChronicleMap, final long valuePosition = entry.position(); keySizeMarshaller.writeSize(destination, keySize); - System.out.println("keySize= " + keySize); - valueSizeMarshaller.writeSize(destination, valueSize); destination.writeStopBit(timeStamp); @@ -495,19 +493,10 @@ final class ReplicatedChronicleMap, public void readExternalEntry(@NotNull Bytes source) { final long keySize = keySizeMarshaller.readSize(source); - System.out.println("read keySize= " + keySize); - - // long valueSize = source.readStopBit(); - final long valueSize = valueSizeMarshaller.readSize(source); - System.out.println("read valueSize= " + valueSize); - - final long timeStamp = source.readStopBit(); - System.out.println("read timestamp= " + timeStamp); - final byte id = source.readByte(); final boolean isDeleted = source.readBoolean(); diff --git a/src/test/java/net/openhft/chronicle/map/TCPSocketReplicationNativeTest.java b/src/test/java/net/openhft/chronicle/map/TCPSocketReplicationNativeTest.java index d84fe0f53..6db9d081f 100644 --- a/src/test/java/net/openhft/chronicle/map/TCPSocketReplicationNativeTest.java +++ b/src/test/java/net/openhft/chronicle/map/TCPSocketReplicationNativeTest.java @@ -50,13 +50,13 @@ public class TCPSocketReplicationNativeTest { public void setup() throws IOException { InetSocketAddress endpoint = new InetSocketAddress("localhost", 8077); - TcpTransportAndNetworkConfig tcpConfig1 = TcpTransportAndNetworkConfig.forSendingNode(8076, endpoint) + TcpTransportAndNetworkConfig tcpConfig1 = TcpTransportAndNetworkConfig.of(8076, endpoint) .heartBeatInterval(1L, TimeUnit.SECONDS); map1 = OffHeapUpdatableChronicleMapBuilder.of(Integer.class, LongValue.class) .replication((byte) 1, tcpConfig1).create(); - TcpTransportAndNetworkConfig tcpConfig2 = TcpTransportAndNetworkConfig.forReceivingOnlyNode(8077) + TcpTransportAndNetworkConfig tcpConfig2 = TcpTransportAndNetworkConfig.of(8077) .heartBeatInterval(1L, TimeUnit.SECONDS); map2 = OffHeapUpdatableChronicleMapBuilder.of(Integer.class, LongValue.class) @@ -89,7 +89,6 @@ public class TCPSocketReplicationNativeTest { } - // allow time for the recompilation to resolve waitTillEqual(5000); @@ -99,7 +98,6 @@ public class TCPSocketReplicationNativeTest { } - @Test public void test2Puts() throws IOException, InterruptedException { @@ -126,7 +124,6 @@ public class TCPSocketReplicationNativeTest { } /** - * * * waits until map1 and map2 show the same value * * @param timeOutMs timeout in milliseconds