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) {