From 938b9dca7b79ceff544a060b4af64832d82eb9c7 Mon Sep 17 00:00:00 2001
From: leventov <leventov@ya.ru>
Date: Sun, 1 Feb 2015 19:49:58 +0700
Subject: [PATCH] Fixed usages of Bytes.write(Bytes) to conform old semantics

---
 .../serialization/internal/BasicCopyingMetaBytesInterop.java  | 2 +-
 .../hash/serialization/internal/BytesBytesInterop.java        | 2 +-
 src/main/java/net/openhft/chronicle/map/ChannelProvider.java  | 2 +-
 src/main/java/net/openhft/chronicle/map/NodeDiscovery.java    | 2 +-
 .../net/openhft/chronicle/map/ReplicatedChronicleMap.java     | 4 ++--
 .../java/net/openhft/chronicle/map/VanillaChronicleMap.java   | 2 +-
 src/test/java/net/openhft/chronicle/map/CHMUseCasesTest.java  | 3 ---
 .../java/net/openhft/chronicle/map/DemoChronicleMapTest.java  | 1 -
 .../java/net/openhft/chronicle/map/StatelessClientTest.java   | 3 ---
 9 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/src/main/java/net/openhft/chronicle/hash/serialization/internal/BasicCopyingMetaBytesInterop.java b/src/main/java/net/openhft/chronicle/hash/serialization/internal/BasicCopyingMetaBytesInterop.java
index 8bdb4412b..c20f5cc96 100644
--- a/src/main/java/net/openhft/chronicle/hash/serialization/internal/BasicCopyingMetaBytesInterop.java
+++ b/src/main/java/net/openhft/chronicle/hash/serialization/internal/BasicCopyingMetaBytesInterop.java
@@ -65,6 +65,6 @@ public abstract class BasicCopyingMetaBytesInterop<E, W> implements MetaBytesInt
 
     @Override
     public void write(W writer, Bytes bytes, E e) {
-        bytes.write(buffer.buffer);
+        bytes.write(buffer.buffer, buffer.buffer.position(), buffer.buffer.remaining());
     }
 }
diff --git a/src/main/java/net/openhft/chronicle/hash/serialization/internal/BytesBytesInterop.java b/src/main/java/net/openhft/chronicle/hash/serialization/internal/BytesBytesInterop.java
index 6c5a59174..e482ceb59 100644
--- a/src/main/java/net/openhft/chronicle/hash/serialization/internal/BytesBytesInterop.java
+++ b/src/main/java/net/openhft/chronicle/hash/serialization/internal/BytesBytesInterop.java
@@ -44,6 +44,6 @@ public enum BytesBytesInterop implements BytesInterop<Bytes> {
 
     @Override
     public void write(Bytes bytes, Bytes e) {
-        bytes.write(e);
+        bytes.write(e, e.position(), e.remaining());
     }
 }
diff --git a/src/main/java/net/openhft/chronicle/map/ChannelProvider.java b/src/main/java/net/openhft/chronicle/map/ChannelProvider.java
index 2b877a3a8..383e1eb2c 100644
--- a/src/main/java/net/openhft/chronicle/map/ChannelProvider.java
+++ b/src/main/java/net/openhft/chronicle/map/ChannelProvider.java
@@ -504,7 +504,7 @@ final class ChannelProvider implements Closeable {
             @Override
             public void writeExternalEntry(@NotNull Bytes entry, @NotNull Bytes destination,
                                            int na) {
-                destination.write(entry);
+                destination.write(entry, entry.position(), entry.remaining());
             }
 
             @Override
diff --git a/src/main/java/net/openhft/chronicle/map/NodeDiscovery.java b/src/main/java/net/openhft/chronicle/map/NodeDiscovery.java
index 137bca57d..893f9a4be 100644
--- a/src/main/java/net/openhft/chronicle/map/NodeDiscovery.java
+++ b/src/main/java/net/openhft/chronicle/map/NodeDiscovery.java
@@ -755,7 +755,7 @@ class DiscoveryNodeBytesMarshallable implements BytesMarshallable {
             return false;
 
         BOOTSTRAP_BYTES.clear();
-        out.write(BOOTSTRAP_BYTES);
+        out.write(BOOTSTRAP_BYTES, BOOTSTRAP_BYTES.position(), BOOTSTRAP_BYTES.remaining());
 
         ourProposedIdentifier.writeMarshallable(out);
         return true;
diff --git a/src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java b/src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java
index bb25b3406..d57cdb644 100644
--- a/src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java
+++ b/src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java
@@ -514,7 +514,7 @@ final class ReplicatedChronicleMap<K, KI, MKI extends MetaBytesInterop<K, ? supe
         // write the key
         entry.position(keyPosition);
         entry.limit(keyLimit);
-        destination.write(entry);
+        destination.write(entry, entry.position(), entry.remaining());
 
         boolean debugEnabled = LOG.isDebugEnabled();
         String message = null;
@@ -539,7 +539,7 @@ final class ReplicatedChronicleMap<K, KI, MKI extends MetaBytesInterop<K, ? supe
 
         // writes the value
         entry.limit(entry.position() + valueSize);
-        destination.write(entry);
+        destination.write(entry, entry.position(), entry.remaining());
 
         if (debugEnabled) {
             LOG.debug(message + "value=" + entry.toString().trim() + ")");
diff --git a/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java b/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java
index 27ab919a7..e64273f5e 100755
--- a/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java
+++ b/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java
@@ -973,7 +973,7 @@ class VanillaChronicleMap<K, KI, MKI extends MetaBytesInterop<K, ? super KI>,
 
         @Override
         public void write(Void writer, Bytes bytes, Bytes value) {
-            bytes.write(value);
+            bytes.write(value, value.position(), value.remaining());
         }
     }
 
diff --git a/src/test/java/net/openhft/chronicle/map/CHMUseCasesTest.java b/src/test/java/net/openhft/chronicle/map/CHMUseCasesTest.java
index 884d10213..fb68da878 100644
--- a/src/test/java/net/openhft/chronicle/map/CHMUseCasesTest.java
+++ b/src/test/java/net/openhft/chronicle/map/CHMUseCasesTest.java
@@ -480,7 +480,6 @@ public class CHMUseCasesTest {
         }
     }
 
-    @Ignore
     @Test
     public void testStringStringMap() throws ExecutionException, InterruptedException,
             IOException {
@@ -516,7 +515,6 @@ public class CHMUseCasesTest {
     }
 
 
-    @Ignore
     @Test
     public void testStringStringMapMutableValue() throws ExecutionException, InterruptedException, IOException {
 
@@ -2510,7 +2508,6 @@ public class CHMUseCasesTest {
         }
     }
 
-    @Ignore
     @Test
     public void testMapStringIntegerValueWithoutListMarshallers() throws IOException {
         ChronicleMapBuilder<String, Map<String, Integer>> builder = ChronicleMapBuilder
diff --git a/src/test/java/net/openhft/chronicle/map/DemoChronicleMapTest.java b/src/test/java/net/openhft/chronicle/map/DemoChronicleMapTest.java
index 952d83aa5..fb5013777 100755
--- a/src/test/java/net/openhft/chronicle/map/DemoChronicleMapTest.java
+++ b/src/test/java/net/openhft/chronicle/map/DemoChronicleMapTest.java
@@ -53,7 +53,6 @@ public class DemoChronicleMapTest {
         }
     }
 
-    @Ignore
     @Test
     public void testMapLocked() throws Exception {
         File file = File.createTempFile("DummyOrders-"+System.currentTimeMillis(), ".test");
diff --git a/src/test/java/net/openhft/chronicle/map/StatelessClientTest.java b/src/test/java/net/openhft/chronicle/map/StatelessClientTest.java
index f80823660..a3bf2b922 100644
--- a/src/test/java/net/openhft/chronicle/map/StatelessClientTest.java
+++ b/src/test/java/net/openhft/chronicle/map/StatelessClientTest.java
@@ -269,7 +269,6 @@ public class StatelessClientTest {
         }
     }
 
-    @Ignore
     @Test(timeout = 10000)
     public void testServerPutStringKeyMap() throws IOException, InterruptedException {
 
@@ -287,7 +286,6 @@ public class StatelessClientTest {
         }
     }
 
-    @Ignore
     @Test(timeout = 10000)
     public void testServerPutClientReplace() throws IOException, InterruptedException {
 
@@ -330,7 +328,6 @@ public class StatelessClientTest {
     }
 
 
-    @Ignore
     @Test(timeout = 10000)
     public void testStringKeyMapPutIfAbsentIntoStatelessMap() throws IOException,
             InterruptedException {