From 2bf71da7958f322613f09eda0ec596317db9b01d Mon Sep 17 00:00:00 2001
From: leventov <leventov@ya.ru>
Date: Wed, 17 Sep 2014 10:48:05 +0400
Subject: [PATCH] Fixed ChronicleMapBuilder.SerializableMarshaller to use
 ObjectSerializer, configured for the builder/map

---
 .../chronicle/map/ChronicleMapBuilder.java       | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/src/main/java/net/openhft/chronicle/map/ChronicleMapBuilder.java b/src/main/java/net/openhft/chronicle/map/ChronicleMapBuilder.java
index 3925471cd..e03241319 100644
--- a/src/main/java/net/openhft/chronicle/map/ChronicleMapBuilder.java
+++ b/src/main/java/net/openhft/chronicle/map/ChronicleMapBuilder.java
@@ -767,29 +767,19 @@ public class ChronicleMapBuilder<K, V> implements Cloneable {
 
         @Override
         public void write(Bytes bytes, Object obj) {
-            try {
-                new ObjectOutputStream(bytes.outputStream()).writeObject(obj);
-            } catch (IOException e) {
-                throw new IllegalStateException(e);
-            }
+            bytes.writeObject(obj);
         }
 
         @Nullable
         @Override
         public Object read(Bytes bytes) {
-            try {
-                return new ObjectInputStream(bytes.inputStream()).readObject();
-            } catch (IOException e) {
-                throw new IllegalStateException(e);
-            } catch (ClassNotFoundException e) {
-                throw new IllegalStateException(e);
-            }
+            return bytes.readObject();
         }
 
         @Nullable
         @Override
         public Object read(Bytes bytes, @Nullable Object obj) {
-            return read(bytes);
+            return bytes.readInstance(null, obj);
         }
     }