From 35c721419c0635bbb48878c093d11ed8e58448cb Mon Sep 17 00:00:00 2001
From: Peter Lawrey <peter.lawrey@higherfrequencytrading.com>
Date: Sun, 17 Apr 2016 19:36:06 +0100
Subject: [PATCH] Fix a couple of API changes.

---
 .../openhft/chronicle/map/VanillaChronicleMap.java   |  2 --
 .../map/impl/stage/data/ZeroBytesStore.java          | 12 ++++++++++++
 .../CharSequenceCustomEncodingBytesWriter.java       | 10 ++++++++--
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java b/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java
index ee1dcb4a1..23ed24339 100755
--- a/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java
+++ b/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java
@@ -28,8 +28,6 @@ import net.openhft.chronicle.hash.serialization.SizeMarshaller;
 import net.openhft.chronicle.hash.serialization.SizedReader;
 import net.openhft.chronicle.hash.serialization.impl.SerializationBuilder;
 import net.openhft.chronicle.map.impl.*;
-import net.openhft.chronicle.map.impl.CompiledMapIterationContext;
-import net.openhft.chronicle.map.impl.CompiledMapQueryContext;
 import net.openhft.chronicle.map.impl.ret.InstanceReturnValue;
 import net.openhft.chronicle.set.ChronicleSet;
 import net.openhft.chronicle.wire.WireIn;
diff --git a/src/main/java/net/openhft/chronicle/map/impl/stage/data/ZeroBytesStore.java b/src/main/java/net/openhft/chronicle/map/impl/stage/data/ZeroBytesStore.java
index c8d45aa48..6a07df95c 100644
--- a/src/main/java/net/openhft/chronicle/map/impl/stage/data/ZeroBytesStore.java
+++ b/src/main/java/net/openhft/chronicle/map/impl/stage/data/ZeroBytesStore.java
@@ -67,6 +67,11 @@ public enum ZeroBytesStore implements BytesStore<ZeroBytesStore, Void> {
         return false;
     }
 
+    @Override
+    public boolean sharedMemory() {
+        return false;
+    }
+
     @Override
     public ZeroBytesStore copy() {
         throw new UnsupportedOperationException();
@@ -83,6 +88,13 @@ public enum ZeroBytesStore implements BytesStore<ZeroBytesStore, Void> {
         throw new UnsupportedOperationException();
     }
 
+    @Override
+
+    public void move(long from, long to, long length) {
+        if (length != 0)
+            throw new UnsupportedOperationException();
+    }
+
     @Override
     public long address(long offset) throws UnsupportedOperationException {
         return offset;
diff --git a/src/test/java/net/openhft/chronicle/map/fromdocs/CharSequenceCustomEncodingBytesWriter.java b/src/test/java/net/openhft/chronicle/map/fromdocs/CharSequenceCustomEncodingBytesWriter.java
index ac1d0255e..c5efec34d 100644
--- a/src/test/java/net/openhft/chronicle/map/fromdocs/CharSequenceCustomEncodingBytesWriter.java
+++ b/src/test/java/net/openhft/chronicle/map/fromdocs/CharSequenceCustomEncodingBytesWriter.java
@@ -96,7 +96,7 @@ public final class CharSequenceCustomEncodingBytesWriter
 
             if (cr.isOverflow()) {
                 outputBuffer.flip();
-                out.write(outputBuffer);
+                writeOutputBuffer(out);
                 outputBuffer.clear();
                 continue;
             }
@@ -108,11 +108,17 @@ public final class CharSequenceCustomEncodingBytesWriter
             }
         }
         outputBuffer.flip();
-        out.write(outputBuffer);
+        writeOutputBuffer(out);
 
         out.writeInt(encodedSizePos, (int) (out.writePosition() - encodedSizePos - 4));
     }
 
+    private void writeOutputBuffer(Bytes out) {
+        int remaining = outputBuffer.remaining();
+        out.write(out.writePosition(), outputBuffer, 0, remaining);
+        out.writeSkip(remaining);
+    }
+
     /**
      * Need this method because {@link CharBuffer#append(CharSequence, int, int)} produces garbage
      */