Merge remote-tracking branch 'origin/master'

This commit is contained in:
Peter Lawrey
2014-10-24 17:24:13 +01:00
6 changed files with 67 additions and 73 deletions
@@ -18,7 +18,6 @@
package net.openhft.chronicle.map;
import org.junit.Ignore;
import org.junit.Test;
import org.testng.Assert;
@@ -104,7 +103,6 @@ public class StatelessClientTest {
@Test
@Ignore
public void testBufferOverFlowPutAll() throws IOException, InterruptedException {
final ChronicleMap<Integer, CharSequence> serverMap;
@@ -116,15 +114,12 @@ public class StatelessClientTest {
statelessMap = ChronicleMapBuilder.of(Integer
.class, CharSequence.class)
.stateless(remoteAddress(new InetSocketAddress("localhost", 8076))).create();
}
// server
{
serverMap = ChronicleMapBuilder.of(Integer.class, CharSequence.class)
.replicators((byte) 2, TcpReplicationConfig.of(8076)).create();
}
@@ -146,7 +141,6 @@ public class StatelessClientTest {
}
@Test
public void testEquals() throws IOException, InterruptedException {
@@ -155,7 +149,6 @@ public class StatelessClientTest {
final ChronicleMap<Integer, CharSequence> statelessMap1;
final ChronicleMap<Integer, CharSequence> statelessMap2;
// stateless client
{
statelessMap1 = ChronicleMapBuilder.of(Integer
@@ -164,8 +157,6 @@ public class StatelessClientTest {
statelessMap2 = ChronicleMapBuilder.of(Integer
.class, CharSequence.class)
.stateless(remoteAddress(new InetSocketAddress("localhost", 8077))).create();
}
// server