commit | 72282af713e3651dd5c1cd4a6e06c6bb61e7f839 | [log] [tgz] |
---|---|---|
author | Madan Jampani <madan.jampani@gmail.com> | Tue Feb 23 14:23:52 2016 -0800 |
committer | Gerrit Code Review <gerrit@onlab.us> | Tue Feb 23 23:26:19 2016 +0000 |
tree | 37b76bd1f6013a9f64915a8e64f7eb1f50da5d35 | |
parent | d0949d2857431c1dc7599604574fb686464da4db [diff] |
Fixes some issues that were preventing intent tests from running - LeadershipStore to support serving getAllLeaderships from cache. - Removed a changed to KryoNamespaces that was causing serialization issues. Instead moved that type registration to McastStore. Change-Id: I06acf1a397b6a982c0dfd0ebc0830b2161cf23a4
diff --git a/incubator/store/src/main/java/org/onosproject/incubator/store/mcast/impl/DistributedMcastStore.java b/incubator/store/src/main/java/org/onosproject/incubator/store/mcast/impl/DistributedMcastStore.java index 06e908b..e48852c 100644 --- a/incubator/store/src/main/java/org/onosproject/incubator/store/mcast/impl/DistributedMcastStore.java +++ b/incubator/store/src/main/java/org/onosproject/incubator/store/mcast/impl/DistributedMcastStore.java
@@ -22,6 +22,7 @@ import java.util.Map; import java.util.Set; +import java.util.concurrent.atomic.AtomicReference; import static org.slf4j.LoggerFactory.getLogger; @@ -56,6 +57,7 @@ .withSerializer(Serializer.using(KryoNamespace.newBuilder() .register(KryoNamespaces.API) .register( + AtomicReference.class, MulticastData.class, McastRoute.class, McastRoute.Type.class
diff --git a/incubator/store/src/main/java/org/onosproject/incubator/store/mcast/impl/MulticastData.java b/incubator/store/src/main/java/org/onosproject/incubator/store/mcast/impl/MulticastData.java index 7bf4a10..0d2fa24 100644 --- a/incubator/store/src/main/java/org/onosproject/incubator/store/mcast/impl/MulticastData.java +++ b/incubator/store/src/main/java/org/onosproject/incubator/store/mcast/impl/MulticastData.java
@@ -57,6 +57,7 @@ } public void setSource(ConnectPoint source) { + // FIXME: violates immutability isEmpty.set(false); this.source.set(source); }