HCOLL-283 HCOLL-276 Fixed a bug in with underinitialized key/value serialization builders when the server map is deserialized from file

This commit is contained in:
leventov
2014-12-31 02:01:25 +07:00
parent 0a464731f6
commit 52b8ad86d5
5 changed files with 17 additions and 11 deletions
@@ -111,13 +111,10 @@ class VanillaChronicleMap<K, KI, MKI extends MetaBytesInterop<K, ? super KI>,
transient BytesStore ms;
transient long headerSize;
transient Set<Map.Entry<K, V>> entrySet;
transient final SerializationBuilder<K> keyBuilder;
transient final SerializationBuilder<V> valueBuilder;
public VanillaChronicleMap(ChronicleMapBuilder<K, V> builder) throws IOException {
keyBuilder = builder.keyBuilder;
SerializationBuilder<K> keyBuilder = builder.keyBuilder;
kClass = keyBuilder.eClass;
keySizeMarshaller = keyBuilder.sizeMarshaller();
originalKeyReader = keyBuilder.reader();
@@ -129,7 +126,7 @@ class VanillaChronicleMap<K, KI, MKI extends MetaBytesInterop<K, ? super KI>,
originalMetaKeyInterop = (MKI) keyBuilder.metaInterop();
metaKeyInteropProvider = (MetaProvider<K, KI, MKI>) keyBuilder.metaInteropProvider();
valueBuilder = builder.valueBuilder;
SerializationBuilder<V> valueBuilder = builder.valueBuilder;
vClass = valueBuilder.eClass;
if (vClass.getName().endsWith("$$Native")) {
nativeValueClass = vClass;