Merge remote-tracking branch 'origin/master'

This commit is contained in:
Rob Austin
2014-10-29 15:32:29 +00:00
9 changed files with 73 additions and 56 deletions
@@ -1887,15 +1887,7 @@ class KeyValueSerializer<K, V> {
private boolean nullCheck(Bytes in) {
try {
return in.readBoolean();
} catch (BufferUnderflowException e) {
e.printStackTrace();
throw e;
}
return in.readBoolean();
}
K readKey(Bytes reader) {
@@ -51,7 +51,6 @@ class VanillaChronicleMap<K, KI, MKI extends MetaBytesInterop<K, KI>,
V, VW, MVW extends MetaBytesWriter<V, VW>> extends AbstractMap<K, V>
implements ChronicleMap<K, V>, Serializable {
private static final long serialVersionUID = 2L;
private static final Logger LOG = LoggerFactory.getLogger(VanillaChronicleMap.class);
/**
* Because DirectBitSet implementations couldn't find more than 64 continuous clear or set