From b6f00d110b8c4b297a6cb295fcfcfb43e2d5e9cb Mon Sep 17 00:00:00 2001
From: leventov <leventov@ya.ru>
Date: Tue, 7 Oct 2014 05:14:32 +0400
Subject: [PATCH] Fixed a bug in ByteArrayMarshaller

---
 .../chronicle/map/serialization/impl/ByteArrayMarshaller.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/net/openhft/chronicle/map/serialization/impl/ByteArrayMarshaller.java b/src/main/java/net/openhft/chronicle/map/serialization/impl/ByteArrayMarshaller.java
index 0fa9c4e26..9b84ec7d9 100644
--- a/src/main/java/net/openhft/chronicle/map/serialization/impl/ByteArrayMarshaller.java
+++ b/src/main/java/net/openhft/chronicle/map/serialization/impl/ByteArrayMarshaller.java
@@ -58,7 +58,7 @@ public enum ByteArrayMarshaller implements BytesInterop<byte[]>, BytesReader<byt
 
     @Override
     public byte[] read(Bytes bytes, long size, byte[] ba) {
-        if (size != ba.length)
+        if (ba == null || size != ba.length)
             ba = new byte[(int) size];
         bytes.read(ba);
         return ba;