commit ecfca4f87797283ce7ab068824e73e5839cb574c
author Jordan Halterman <jordan@opennetworking.org> Thu Aug 03 21:38:02 2017 -0700
committer Jordan Halterman <jordan@opennetworking.org> Mon Aug 07 22:19:56 2017 +0000
tree 44ece0979a9bb88ea0a807e39860c7b692cf9094
parent a37e32f488c8fa456cf7b29de550a7f02b3fe779

[ONOS-6892] Use streams for Kryo serialization to avoid IndexOutOfBoundsException when serializing/deserializing large objects

Change-Id: Ifc1ecf59f655aa65f034f94e10b61e77bbe4c3c4

utils/misc/src/main/java/org/onlab/util/KryoNamespace.java

diff --git a/utils/misc/src/main/java/org/onlab/util/KryoNamespace.java b/utils/misc/src/main/java/org/onlab/util/KryoNamespace.java
index e87c6bf..2aca86d 100644
--- a/utils/misc/src/main/java/org/onlab/util/KryoNamespace.java
+++ b/utils/misc/src/main/java/org/onlab/util/KryoNamespace.java
@@ -33,6 +33,8 @@
 import org.objenesis.strategy.StdInstantiatorStrategy;
 import org.slf4j.Logger;
 
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.nio.ByteBuffer;
@@ -303,11 +305,12 @@
      * @return serialized bytes
      */
     public byte[] serialize(final Object obj, final int bufferSize) {
-        Output out = new Output(bufferSize, MAX_BUFFER_SIZE);
+        ByteArrayOutputStream outputStream = new ByteArrayOutputStream(bufferSize);
+        Output out = new Output(outputStream);
         return pool.run(kryo -> {
             kryo.writeClassAndObject(out, obj);
             out.flush();
-            return out.toBytes();
+            return outputStream.toByteArray();
         });
     }
 
@@ -364,7 +367,7 @@
      * @return deserialized Object
      */
     public <T> T deserialize(final byte[] bytes) {
-        Input in = new Input(bytes);
+        Input in = new Input(new ByteArrayInputStream(bytes));
         Kryo kryo = borrow();
         try {
             @SuppressWarnings("unchecked")