Merge remote-tracking branch 'origin/master'

This commit is contained in:
Rob Austin
2014-10-21 17:22:13 +01:00
@@ -21,9 +21,9 @@ import net.openhft.chronicle.common.serialization.AgileBytesMarshaller;
import net.openhft.chronicle.common.serialization.MetaBytesInterop;
import net.openhft.chronicle.common.serialization.MetaBytesWriter;
import net.openhft.chronicle.common.serialization.MetaProvider;
import net.openhft.chronicle.set.ChronicleSetBuilder;
import net.openhft.chronicle.common.threadlocal.Provider;
import net.openhft.chronicle.common.threadlocal.ThreadLocalCopies;
import net.openhft.chronicle.set.ChronicleSetBuilder;
import net.openhft.lang.Maths;
import net.openhft.lang.io.ByteBufferBytes;
import net.openhft.lang.io.Bytes;
@@ -859,7 +859,7 @@ public class ChronicleMapBuilder<K, V> implements Cloneable,
keyBuilder.objectSerializer(objectSerializer());
valueBuilder.objectSerializer(objectSerializer());
int maxSize = entrySize() * figureBufferAllocationFactor();
long maxSize = (long) entrySize() * figureBufferAllocationFactor();
keyBuilder.maxSize(maxSize);
valueBuilder.maxSize(maxSize);