Merge branch 'master' into new-license

src/main/java/net/openhft/chronicle/map/ChronicleMapBuilder.java

@@ -749,6 +749,7 @@ public final class ChronicleMapBuilder<K, V> implements
         double valueSize = averageValueSize();
         size += averageSizeStoringLength(valueBuilder, valueSize);
         int alignment = valueAlignment();
+        size = alignAddr((long) Math.ceil(size), alignment); // so the value starts aligned
         int worstAlignment;
         if (worstAlignmentComputationRequiresValueSize(alignment)) {
             long constantSizeBeforeAlignment = toLong(size);
@@ -924,6 +925,8 @@ public final class ChronicleMapBuilder<K, V> implements
             throw new IllegalArgumentException("Alignment should be a power of 2, " + alignment +
                     " given");
         }
+        if (Jvm.isArm() && alignment < 8)
+            return this;
         this.alignment = alignment;
         return this;
     }

src/main/java/net/openhft/chronicle/map/impl/stage/data/ZeroBytesStore.java

@@ -22,7 +22,6 @@ import net.openhft.chronicle.core.OS;
 import org.jetbrains.annotations.Nullable;
 
 import java.nio.BufferOverflowException;
-import java.nio.BufferUnderflowException;
 import java.nio.ByteBuffer;
 
 public enum ZeroBytesStore implements BytesStore<ZeroBytesStore, Void> {
@@ -39,22 +38,22 @@ public enum ZeroBytesStore implements BytesStore<ZeroBytesStore, Void> {
     }
 
     @Override
-    public byte readVolatileByte(long offset) throws BufferUnderflowException {
+    public byte readVolatileByte(long offset) {
         return 0;
     }
 
     @Override
-    public short readVolatileShort(long offset) throws BufferUnderflowException {
+    public short readVolatileShort(long offset) {
         return 0;
     }
 
     @Override
-    public int readVolatileInt(long offset) throws BufferUnderflowException {
+    public int readVolatileInt(long offset) {
         return 0;
     }
 
     @Override
-    public long readVolatileLong(long offset) throws BufferUnderflowException {
+    public long readVolatileLong(long offset) {
         return 0;
     }
 
@@ -127,22 +126,31 @@ public enum ZeroBytesStore implements BytesStore<ZeroBytesStore, Void> {
     }
 
     @Override
-    public long addressForRead(long offset) throws UnsupportedOperationException {
+    public long addressForRead(long offset) {
         return offset;
     }
 
     @Override
-    public boolean compareAndSwapInt(long offset, int expected, int value)
-            throws BufferOverflowException, IllegalArgumentException {
-        throw new UnsupportedOperationException();
+    public boolean compareAndSwapInt(long offset, int expected, int value) {
+        if (expected != 0 || value != 0)
+            throw new UnsupportedOperationException();
+        return true;
     }
 
     @Override
-    public boolean compareAndSwapLong(long offset, long expected, long value)
-            throws BufferOverflowException, IllegalArgumentException {
-        throw new UnsupportedOperationException();
+    public void testAndSetInt(long offset, int expected, int value) {
+        if (expected != 0 || value != 0)
+            throw new UnsupportedOperationException();
     }
 
+    @Override
+    public boolean compareAndSwapLong(long offset, long expected, long value) {
+        if (expected != 0 || value != 0)
+            throw new UnsupportedOperationException();
+        return true;
+    }
+
+
     @Override
     public void reserve() throws IllegalStateException {
     }