commit ad0c30217420d02744c9deb854ca79d88630e306
author Jonathan Hart <jono@onlab.us> Wed Feb 22 14:06:01 2017 -0800
committer Thomas Vachuska <tom@onlab.us> Mon Feb 27 19:18:20 2017 +0000
tree df502d2c058fd0eee12fd34c5feb3167005cfc42
parent 9e4db425e27de41f0d251a7765bb581eb52a47e4

Add HashMultiset Catalyst serializer - used in ConsistentMultimap.

Plus catch serialization exceptions during message receive, simplify
implementation of HashMultisetValueCollector, other minor cleanups.

Change-Id: Ia50b39205a8241f456ee90ef765a8e478da868ab

core/store/primitives/src/main/java/org/onosproject/store/primitives/resources/impl/AtomixConsistentSetMultimapState.java

diff --git a/core/store/primitives/src/main/java/org/onosproject/store/primitives/resources/impl/AtomixConsistentSetMultimapState.java b/core/store/primitives/src/main/java/org/onosproject/store/primitives/resources/impl/AtomixConsistentSetMultimapState.java
index 746ee00..5110187 100644
--- a/core/store/primitives/src/main/java/org/onosproject/store/primitives/resources/impl/AtomixConsistentSetMultimapState.java
+++ b/core/store/primitives/src/main/java/org/onosproject/store/primitives/resources/impl/AtomixConsistentSetMultimapState.java
@@ -598,16 +598,10 @@
             Collector<MapEntryValue,
                     HashMultiset<byte[]>,
                     HashMultiset<byte[]>> {
-        private HashMultiset<byte[]> multiset = null;
 
         @Override
         public Supplier<HashMultiset<byte[]>> supplier() {
-            return () -> {
-                if (multiset == null) {
-                    multiset = HashMultiset.create();
-                }
-                return multiset;
-            };
+            return HashMultiset::create;
         }
 
         @Override
@@ -627,7 +621,7 @@
         @Override
         public Function<HashMultiset<byte[]>,
                 HashMultiset<byte[]>> finisher() {
-            return (unused) -> multiset;
+            return Function.identity();
         }
 
         @Override