diff --git a/pom.xml b/pom.xml old mode 100644 new mode 100755 index 9d60d0d5d..45f202895 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ 4.0.0 chronicle-map - 2.1.11-SNAPSHOT + 2.2-SNAPSHOT OpenHFT/Chronicle-Map Chronicle-Map diff --git a/src/main/java/net/openhft/chronicle/map/SerializationBuilder.java b/src/main/java/net/openhft/chronicle/map/SerializationBuilder.java old mode 100644 new mode 100755 index 4da9a5f97..1fb0cc3d8 --- a/src/main/java/net/openhft/chronicle/map/SerializationBuilder.java +++ b/src/main/java/net/openhft/chronicle/map/SerializationBuilder.java @@ -315,7 +315,7 @@ final class SerializationBuilder implements Cloneable, Serializable { public SerializationBuilder objectSerializer(ObjectSerializer serializer) { if (reader == null || interop == null) { - marshaller(new SerializableMarshaller(serializer)); + marshaller(new SerializableMarshaller(serializer, eClass)); } return this; } @@ -452,15 +452,17 @@ final class SerializationBuilder implements Cloneable, Serializable { private static final long serialVersionUID = 0L; private final ObjectSerializer serializer; + private final Class expectedClass; - private SerializableMarshaller(ObjectSerializer serializer) { + private SerializableMarshaller(ObjectSerializer serializer, Class expectedClass) { this.serializer = serializer; + this.expectedClass = expectedClass; } @Override public void write(Bytes bytes, Object obj) { try { - serializer.writeSerializable(bytes, obj, null); + serializer.writeSerializable(bytes, obj, expectedClass); } catch (IOException e) { throw new IllegalStateException(e); }