Alawn/Chronicle-Map
1
0
Fork 0
mirror of https://github.com/OpenHFT/Chronicle-Map.git synced 2021-09-13 01:26:12 +00:00
Code Releases Activity

Fixed bug in ChronicleMapBuilder: chose wrong marshaller if key or value class is a BytesMarshallable or Externalizable subclass, but not Byteable subclass

Browse Source
This commit is contained in:
leventov
2014-09-19 22:14:11 +04:00
parent 1c1724b189
commit dc2b6da306
1 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/net/openhft/chronicle/map/ChronicleMapBuilder.java
+7 -12
View File
@@ -78,15 +78,8 @@ public class ChronicleMapBuilder<K, V> implements Cloneable {
ChronicleMapBuilder(Class<K> keyClass, Class<V> valueClass) {
this.keyClass = keyClass;
this.valueClass = valueClass;
Class<K> keyClassForMarshaller =
marshallerUseFactory(keyClass) && keyClass.isInterface() ?
DataValueClasses.directClassFor(keyClass) : keyClass;
keyMarshaller = chooseDefaultMarshaller(keyClassForMarshaller);
Class<V> valueClassForMarshaller =
marshallerUseFactory(valueClass) && valueClass.isInterface() ?
DataValueClasses.directClassFor(valueClass) : valueClass;
valueMarshaller = chooseDefaultMarshaller(valueClassForMarshaller);
keyMarshaller = chooseDefaultMarshaller(keyClass);
valueMarshaller = chooseDefaultMarshaller(valueClass);
valueFactory = marshallerUseFactory(valueClass) ?
new AllocateInstanceObjectFactory(valueClass.isInterface() ?
DataValueClasses.directClassFor(valueClass) :
@@ -106,12 +99,14 @@ public class ChronicleMapBuilder<K, V> implements Cloneable {
@SuppressWarnings("unchecked")
private static <T> BytesMarshaller<T> chooseDefaultMarshaller(@NotNull Class<T> tClass) {
Class<T> classForMarshaller = marshallerUseFactory(tClass) && tClass.isInterface() ?
DataValueClasses.directClassFor(tClass) : tClass;
if (Byteable.class.isAssignableFrom(tClass))
return new ByteableMarshaller(tClass);
return new ByteableMarshaller(classForMarshaller);
if (BytesMarshallable.class.isAssignableFrom(tClass))
return new BytesMarshallableMarshaller(tClass);
return new BytesMarshallableMarshaller(classForMarshaller);
if (Externalizable.class.isAssignableFrom(tClass))
return new ExternalizableMarshaller(tClass);
return new ExternalizableMarshaller(classForMarshaller);
if (tClass == CharSequence.class)
return (BytesMarshaller<T>) CharSequenceMarshaller.INSTANCE;
if (tClass == String.class)