commit 4920d051d05ce3db0d7cef018da39a41e8989012
author Sho SHIMIZU <sshimizu@us.fujitsu.com> Thu Jun 16 14:26:35 2016 -0700
committer Gerrit Code Review <gerrit@onlab.us> Fri Jul 01 18:15:14 2016 +0000
tree a30b19c4a9e92a1c6f7cfd1fabba10cfbb348f27
parent f8035d3817b728d287d3cc3ad8b33091d7396974

Make sure to supply Kryo serializable set to constructor

Change-Id: Ida776fc3e7fbcacb604ae578865f2a280970101c

core/store/dist/src/main/java/org/onosproject/store/resource/impl/GenericDiscreteResources.java

diff --git a/core/store/dist/src/main/java/org/onosproject/store/resource/impl/GenericDiscreteResources.java b/core/store/dist/src/main/java/org/onosproject/store/resource/impl/GenericDiscreteResources.java
index ca6728f..1f0f62d 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/resource/impl/GenericDiscreteResources.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/resource/impl/GenericDiscreteResources.java
@@ -16,7 +16,6 @@
 package org.onosproject.store.resource.impl;
 
 import com.google.common.base.MoreObjects;
-import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Sets;
 
 import org.onosproject.net.resource.DiscreteResource;
@@ -41,7 +40,7 @@
     }
 
     private GenericDiscreteResources(Set<DiscreteResource> values) {
-        this.values = ImmutableSet.copyOf(values);
+        this.values = values;
     }
 
     // for serializer
@@ -62,7 +61,8 @@
     @Override
     public DiscreteResources difference(DiscreteResources other) {
         if (other instanceof GenericDiscreteResources) {
-            return of(Sets.difference(this.values(), other.values()));
+            // make sure that the set is serializable
+            return of(new LinkedHashSet<>(Sets.difference(this.values(), other.values())));
         } else if (other instanceof EmptyDiscreteResources) {
             return this;
         }
@@ -84,7 +84,8 @@
     @Override
     public DiscreteResources add(DiscreteResources other) {
         if (other instanceof GenericDiscreteResources) {
-            return new GenericDiscreteResources(Sets.union(this.values(), other.values()));
+            // make sure that the set is serializable
+            return of(new LinkedHashSet<>(Sets.union(this.values(), other.values())));
         } else if (other instanceof EmptyDiscreteResources) {
             return this;
         }