From 4d9fe081d0f56285a531e15887fd694405dc0634 Mon Sep 17 00:00:00 2001
From: Rob Austin <rob.austin@boundedbuffer>
Date: Wed, 29 Oct 2014 19:14:30 +0000
Subject: [PATCH] updated dependencies for release - and improved stateless
 client

---
 pom.xml                                       | 22 +++++++++++++++----
 .../chronicle/hash/ChronicleHashBuilder.java  |  2 +-
 .../chronicle/map/StatelessChronicleMap.java  | 11 +++++-----
 3 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/pom.xml b/pom.xml
index 252b46436..8bed293a8 100755
--- a/pom.xml
+++ b/pom.xml
@@ -17,13 +17,15 @@
   ~ limitations under the License.
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
         <groupId>net.openhft</groupId>
         <artifactId>java-parent-pom</artifactId>
         <version>1.1.2</version>
-        <relativePath />
+        <relativePath/>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -46,7 +48,7 @@
             <dependency>
                 <groupId>net.openhft</groupId>
                 <artifactId>lang</artifactId>
-                <version>6.4.11-SNAPSHOT</version>
+                <version>6.4.11</version>
             </dependency>
 
             <dependency>
@@ -61,12 +63,18 @@
                 <version>2.2.0</version>
             </dependency>
 
+
         </dependencies>
 
     </dependencyManagement>
 
     <dependencies>
 
+        <dependency>
+            <groupId>net.openhft</groupId>
+            <artifactId>compiler</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>net.openhft</groupId>
             <artifactId>lang</artifactId>
@@ -77,6 +85,11 @@
             <artifactId>slf4j-api</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.intellij</groupId>
+            <artifactId>annotations</artifactId>
+        </dependency>
+
         <!-- test dependencies -->
 
         <dependency>
@@ -118,7 +131,8 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-scm-publish-plugin</artifactId>
                 <configuration>
-                    <checkoutDirectory>${project.build.directory}/scmpublish/javadoc</checkoutDirectory>
+                    <checkoutDirectory>${project.build.directory}/scmpublish/javadoc
+                    </checkoutDirectory>
                     <checkinComment>Publishing javadoc for ${project.artifactId}:${project.version}
                     </checkinComment>
                     <content>${project.reporting.outputDirectory}</content>
diff --git a/src/main/java/net/openhft/chronicle/hash/ChronicleHashBuilder.java b/src/main/java/net/openhft/chronicle/hash/ChronicleHashBuilder.java
index 61b4481f2..ab5624b35 100644
--- a/src/main/java/net/openhft/chronicle/hash/ChronicleHashBuilder.java
+++ b/src/main/java/net/openhft/chronicle/hash/ChronicleHashBuilder.java
@@ -399,7 +399,7 @@ public interface ChronicleHashBuilder<K, C extends ChronicleHash,
      * consider to be a ClientProxy to  {@link ChronicleMap} or {@link ChronicleSet}  running on
      * another host
      *
-     * @param statelessBuilder Stateless Client Config
+     * @param statelessBuilder Stateless Client Config, {@code null} demotes no statelessBuilder
      * @return this builder back
      */
     B stateless(StatelessBuilder statelessBuilder);
diff --git a/src/main/java/net/openhft/chronicle/map/StatelessChronicleMap.java b/src/main/java/net/openhft/chronicle/map/StatelessChronicleMap.java
index 4c9b84144..1be7354ef 100644
--- a/src/main/java/net/openhft/chronicle/map/StatelessChronicleMap.java
+++ b/src/main/java/net/openhft/chronicle/map/StatelessChronicleMap.java
@@ -584,7 +584,7 @@ class StatelessChronicleMap<K, V> implements ChronicleMap<K, V>, Closeable {
         // get the data back from the server
         Bytes in = blockingFetch0(sizeLocation, transactionId, startTime);
         final ThreadLocalCopies local = keyValueSerializer.threadLocalCopies();
-        final Set<Map.Entry<K, V>> result = new HashSet<Map.Entry<K, V>>();
+        final Map<K, V> result = new HashMap<K, V>();
 
         for (; ; ) {
 
@@ -594,10 +594,9 @@ class StatelessChronicleMap<K, V> implements ChronicleMap<K, V>, Closeable {
             final long size = in.readInt();
 
             for (int i = 0; i < size; i++) {
-
-                K k = keyValueSerializer.readKey(in, local);
-                V v = keyValueSerializer.readValue(in, local);
-                result.add(new Entry(k, v));
+                final K k = keyValueSerializer.readKey(in, local);
+                final V v = keyValueSerializer.readValue(in, local);
+                result.put(k, v);
             }
 
             if (!hasMoreEntries)
@@ -609,7 +608,7 @@ class StatelessChronicleMap<K, V> implements ChronicleMap<K, V>, Closeable {
         }
 
 
-        return result;
+        return result.entrySet();
     }
 
     private void compact(Bytes in) {