commit 885be1d0aeddfa6b34de3f0488555c974862eb33
author Yuta HIGUCHI <y-higuchi@onlab.us> Sat Oct 04 21:47:26 2014 -0700
committer Yuta HIGUCHI <y-higuchi@onlab.us> Sat Oct 04 21:49:42 2014 -0700
tree 45b7cdc86c10ad9a164c853acc393f604396288c
parent 5bdebe38f9218b2fd130b694bc0d52bd3863e72e

Fixed annotation handling.

- Store as SparseAnnotations internally and convert to Annotations
  when merging multiple provider supplied annotations.

Change-Id: I82fe159b536b3e7344a33e09792f6a3473fb3500

core/store/dist/src/main/java/org/onlab/onos/store/device/impl/GossipDeviceStore.java

diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/device/impl/GossipDeviceStore.java b/core/store/dist/src/main/java/org/onlab/onos/store/device/impl/GossipDeviceStore.java
index ac38e23..85d9b07 100644
--- a/core/store/dist/src/main/java/org/onlab/onos/store/device/impl/GossipDeviceStore.java
+++ b/core/store/dist/src/main/java/org/onlab/onos/store/device/impl/GossipDeviceStore.java
@@ -56,6 +56,7 @@
 import static org.slf4j.LoggerFactory.getLogger;
 import static org.apache.commons.lang3.concurrent.ConcurrentUtils.createIfAbsentUnchecked;
 import static org.onlab.onos.net.DefaultAnnotations.merge;
+import static org.onlab.onos.net.DefaultAnnotations.union;
 import static com.google.common.base.Verify.verify;
 
 // TODO: implement remove event handling and call *Internal
@@ -603,7 +604,7 @@
             Timestamped<DeviceDescription> oldOne = deviceDesc.get();
             Timestamped<DeviceDescription> newOne = newDesc;
             if (oldOne != null) {
-                SparseAnnotations merged = merge(oldOne.value().annotations(),
+                SparseAnnotations merged = union(oldOne.value().annotations(),
                                                  newDesc.value().annotations());
                 newOne = new Timestamped<DeviceDescription>(
                         new DefaultDeviceDescription(newDesc.value(), merged),
@@ -622,7 +623,7 @@
             Timestamped<PortDescription> oldOne = portDescs.get(newDesc.value().portNumber());
             Timestamped<PortDescription> newOne = newDesc;
             if (oldOne != null) {
-                SparseAnnotations merged = merge(oldOne.value().annotations(),
+                SparseAnnotations merged = union(oldOne.value().annotations(),
                                                  newDesc.value().annotations());
                 newOne = new Timestamped<PortDescription>(
                         new DefaultPortDescription(newDesc.value(), merged),