commit 57701af5a40f42b097cd3ef6e643b2ee87433225
author Yuta HIGUCHI <y-higuchi@onlab.us> Fri Jun 06 17:56:28 2014 -0700
committer Gerrit Code Review <gerrit2@gerrit.onos.onlab.us> Mon Jun 09 09:17:30 2014 -0700
tree 353ffc02c2ec18bf336cf4f68bf56f9f8f27b593
parent 531bb23d4fd7646e78ab08bb5ac83839416eb179

BugFix: Kryo instance leak on Exception.

- Kryo instance will leak when there was an Exception thrown
  while deserializing etc. (ONOS-1343)

Change-Id: I70067e4a7111f0d44cef8ebf8ee33f9e02c600b6

src/main/java/net/onrc/onos/core/datagrid/HazelcastEventChannel.java

diff --git a/src/main/java/net/onrc/onos/core/datagrid/HazelcastEventChannel.java b/src/main/java/net/onrc/onos/core/datagrid/HazelcastEventChannel.java
index 00ff7a8..c3a35cf 100644
--- a/src/main/java/net/onrc/onos/core/datagrid/HazelcastEventChannel.java
+++ b/src/main/java/net/onrc/onos/core/datagrid/HazelcastEventChannel.java
@@ -337,21 +337,24 @@
             //
             byte[] valueBytes = event.getValue();
             Kryo kryo = kryoFactory.newKryo();
-            V value = deserializeValue(kryo, valueBytes);
+            try {
+                V value = deserializeValue(kryo, valueBytes);
 
-            //
-            // Deliver the notification
-            //
-            int index = 0;
-            for (IEventChannelListener<K, V> listener : listeners) {
-                V copyValue = value;
-                if (index++ > 0) {
-                    // Each listener should get a deep copy of the value
-                    copyValue = kryo.copy(value);
+                //
+                // Deliver the notification
+                //
+                int index = 0;
+                for (IEventChannelListener<K, V> listener : listeners) {
+                    V copyValue = value;
+                    if (index++ > 0) {
+                        // Each listener should get a deep copy of the value
+                        copyValue = kryo.copy(value);
+                    }
+                    listener.entryAdded(copyValue);
                 }
-                listener.entryAdded(copyValue);
+            } finally {
+                kryoFactory.deleteKryo(kryo);
             }
-            kryoFactory.deleteKryo(kryo);
         }
 
         /**
@@ -366,21 +369,24 @@
             //
             byte[] valueBytes = event.getValue();
             Kryo kryo = kryoFactory.newKryo();
-            V value = deserializeValue(kryo, valueBytes);
+            try {
+                V value = deserializeValue(kryo, valueBytes);
 
-            //
-            // Deliver the notification
-            //
-            int index = 0;
-            for (IEventChannelListener<K, V> listener : listeners) {
-                V copyValue = value;
-                if (index++ > 0) {
-                    // Each listener should get a deep copy of the value
-                    copyValue = kryo.copy(value);
+                //
+                // Deliver the notification
+                //
+                int index = 0;
+                for (IEventChannelListener<K, V> listener : listeners) {
+                    V copyValue = value;
+                    if (index++ > 0) {
+                        // Each listener should get a deep copy of the value
+                        copyValue = kryo.copy(value);
+                    }
+                    listener.entryRemoved(copyValue);
                 }
-                listener.entryRemoved(copyValue);
+            } finally {
+                kryoFactory.deleteKryo(kryo);
             }
-            kryoFactory.deleteKryo(kryo);
         }
 
         /**
@@ -395,21 +401,24 @@
             //
             byte[] valueBytes = event.getValue();
             Kryo kryo = kryoFactory.newKryo();
-            V value = deserializeValue(kryo, valueBytes);
+            try {
+                V value = deserializeValue(kryo, valueBytes);
 
-            //
-            // Deliver the notification
-            //
-            int index = 0;
-            for (IEventChannelListener<K, V> listener : listeners) {
-                V copyValue = value;
-                if (index++ > 0) {
-                    // Each listener should get a deep copy of the value
-                    copyValue = kryo.copy(value);
+                //
+                // Deliver the notification
+                //
+                int index = 0;
+                for (IEventChannelListener<K, V> listener : listeners) {
+                    V copyValue = value;
+                    if (index++ > 0) {
+                        // Each listener should get a deep copy of the value
+                        copyValue = kryo.copy(value);
+                    }
+                    listener.entryUpdated(copyValue);
                 }
-                listener.entryUpdated(copyValue);
+            } finally {
+                kryoFactory.deleteKryo(kryo);
             }
-            kryoFactory.deleteKryo(kryo);
         }
 
         /**