From 51239850a84c4df5443038d75d138205baa27e54 Mon Sep 17 00:00:00 2001
From: Peter Lawrey <peter.lawrey@higherfrequencytrading.com>
Date: Sat, 22 Nov 2014 13:38:07 +0000
Subject: [PATCH 1/2] HCOLL-213 Thread local stateless client

---
 .../chronicle/map/AbstractChronicleMapBuilder.java        | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/net/openhft/chronicle/map/AbstractChronicleMapBuilder.java b/src/main/java/net/openhft/chronicle/map/AbstractChronicleMapBuilder.java
index 653ce44ca..8cc2468e6 100755
--- a/src/main/java/net/openhft/chronicle/map/AbstractChronicleMapBuilder.java
+++ b/src/main/java/net/openhft/chronicle/map/AbstractChronicleMapBuilder.java
@@ -888,13 +888,15 @@ abstract class AbstractChronicleMapBuilder<K, V,
         }
         try {
             Class<?> pmel = Class.forName("com.higherfrequencytrading.chronicle.enterprise.map.PushingMapEventListener");
-            Constructor<?> constructor = pmel.getConstructor(ChronicleMap[].class);
+            Constructor<?> constructor = pmel.getConstructor(ChronicleMapBuilderI[].class);
             // create a stateless client for each address
-            ChronicleMap[] statelessClients = new ChronicleMap[pushToAddresses.length];
+            ChronicleMapBuilderI[] statelessClients = new ChronicleMapBuilderI[pushToAddresses.length];
             ChronicleMapBuilderI<K, V> cmb = clone();
             cmb.pushTo((InetSocketAddress[]) null);
             for (int i = 0; i < pushToAddresses.length; i++) {
-                statelessClients[i] = cmb.statelessClient(pushToAddresses[i]).create();
+                ChronicleMapBuilderI<K, V> clientBuilder = cmb.clone();
+                clientBuilder.statelessClient(pushToAddresses[i]);
+                statelessClients[i] = clientBuilder;
             }
             eventListener = (MapEventListener<K, V, ChronicleMap<K, V>>) constructor.newInstance((Object) statelessClients);
         } catch (ClassNotFoundException e) {

From 085e1cc99de590facc901f23d0ac8360d8af0bae Mon Sep 17 00:00:00 2001
From: Peter Lawrey <peter.lawrey@higherfrequencytrading.com>
Date: Sat, 22 Nov 2014 14:19:09 +0000
Subject: [PATCH 2/2] HCOLL-213 Increase the lock timeout.

---
 .../net/openhft/chronicle/map/AbstractChronicleMapBuilder.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/net/openhft/chronicle/map/AbstractChronicleMapBuilder.java b/src/main/java/net/openhft/chronicle/map/AbstractChronicleMapBuilder.java
index 8cc2468e6..fcc07f197 100755
--- a/src/main/java/net/openhft/chronicle/map/AbstractChronicleMapBuilder.java
+++ b/src/main/java/net/openhft/chronicle/map/AbstractChronicleMapBuilder.java
@@ -125,7 +125,7 @@ abstract class AbstractChronicleMapBuilder<K, V,
     private int entrySize = 0;
     private Alignment alignment = null;
     private long entries = 1 << 20; // 1 million by default
-    private long lockTimeOut = 2000;
+    private long lockTimeOut = 20000;
     private TimeUnit lockTimeOutUnit = TimeUnit.MILLISECONDS;
     private int metaDataBytes = 0;
     private ChronicleHashErrorListener errorListener = ChronicleHashErrorListeners.logging();