commit 22fa5cbcec1caddfbdcb6ac0fb0651d0dab27826
author Madan Jampani <madan@onlab.us> Mon Apr 13 15:53:44 2015 -0700
committer Gerrit Code Review <gerrit@onlab.us> Mon Apr 13 23:42:46 2015 +0000
tree 458cd230eb7e258930d4b8bf5632feb2fa21e46b
parent cfd63d2783f0320e2108496232be25dc0d8603cd

Fix Kryo serialization memory leak

Change-Id: I122cb811971aef1a70a73c3335b485125125c66b

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 63d5363..8ea0c50 100644
--- a/utils/misc/src/main/java/org/onlab/util/KryoNamespace.java
+++ b/utils/misc/src/main/java/org/onlab/util/KryoNamespace.java
@@ -233,13 +233,17 @@
      */
     public byte[] serialize(final Object obj, final int bufferSize) {
         ByteBufferOutput out = new ByteBufferOutput(bufferSize, MAX_BUFFER_SIZE);
-        Kryo kryo = borrow();
         try {
-            kryo.writeClassAndObject(out, obj);
-            out.flush();
-            return out.toBytes();
+            Kryo kryo = borrow();
+            try {
+                kryo.writeClassAndObject(out, obj);
+                out.flush();
+                return out.toBytes();
+            } finally {
+                release(kryo);
+            }
         } finally {
-            release(kryo);
+            out.release();
         }
     }