From 8a1e1085c9b8d181ae0e390c7b70ac983cd4b06f Mon Sep 17 00:00:00 2001
From: Rob Austin <rob.austin@boundedbuffer.co.uk>
Date: Fri, 15 Nov 2019 17:48:11 +0000
Subject: [PATCH] check the use of BytesMarshallable first

---
 .../net/openhft/chronicle/map/ChronicleMapBuilder.java     | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/main/java/net/openhft/chronicle/map/ChronicleMapBuilder.java b/src/main/java/net/openhft/chronicle/map/ChronicleMapBuilder.java
index 4156a4cc8..7c3927b25 100755
--- a/src/main/java/net/openhft/chronicle/map/ChronicleMapBuilder.java
+++ b/src/main/java/net/openhft/chronicle/map/ChronicleMapBuilder.java
@@ -308,14 +308,13 @@ public final class ChronicleMapBuilder<K, V> implements
             builder.averageKeySize(128);
         if (!builder.isValueSizeKnown())
             builder.averageValueSize(512);
-        if (Marshallable.class.isAssignableFrom(valueClass)) {
+        if (BytesMarshallable.class.isAssignableFrom(valueClass)) {
+            builder.valueMarshaller(new BytesMarshallableReaderWriter<>((Class) valueClass));
+        } else if (Marshallable.class.isAssignableFrom(valueClass)) {
             //noinspection unchecked
             builder.averageValueSize(1024)
                     .valueMarshaller(new MarshallableReaderWriter<>((Class) valueClass));
-        } else if (BytesMarshallable.class.isAssignableFrom(valueClass)) {
-            builder.valueMarshaller(new BytesMarshallableReaderWriter<>((Class) valueClass));
         }
-
         return builder;
     }