diff --git a/src/main/java/net/openhft/chronicle/hash/serialization/internal/SerializationBuilder.java b/src/main/java/net/openhft/chronicle/hash/serialization/internal/SerializationBuilder.java old mode 100644 new mode 100755 index a3bea53e6..2531bd62c --- a/src/main/java/net/openhft/chronicle/hash/serialization/internal/SerializationBuilder.java +++ b/src/main/java/net/openhft/chronicle/hash/serialization/internal/SerializationBuilder.java @@ -307,7 +307,7 @@ public 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; } @@ -444,15 +444,17 @@ public 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); }