commit 9eed0b1a346e527c1d7b60e96eccf04433898c33
author Yuta HIGUCHI <y-higuchi@ak.jp.nec.com> Wed Jun 07 11:59:18 2017 -0700
committer Yuta HIGUCHI <y-higuchi@onlab.us> Mon Jun 12 21:19:29 2017 +0000
tree 85c70f51381941a700e6b27660f1baa74e89ed39
parent 6ee6b8ccd240f937b3146aeb47b22cdf6f1a1933

Revisit Annotations merging

- avoid extra instantiation/copying when possible

Change-Id: Ia2f74a1fe2ff1176346316565c9bc6786cd7f6e4

core/net/src/main/java/org/onosproject/net/link/impl/BasicLinkOperator.java

diff --git a/core/net/src/main/java/org/onosproject/net/link/impl/BasicLinkOperator.java b/core/net/src/main/java/org/onosproject/net/link/impl/BasicLinkOperator.java
index 9247b83..7cb6499 100644
--- a/core/net/src/main/java/org/onosproject/net/link/impl/BasicLinkOperator.java
+++ b/core/net/src/main/java/org/onosproject/net/link/impl/BasicLinkOperator.java
@@ -78,6 +78,7 @@
      */
     public static SparseAnnotations combine(BasicLinkConfig cfg, SparseAnnotations an) {
         DefaultAnnotations.Builder b = DefaultAnnotations.builder();
+        b.putAll(an);
         if (cfg.metric() != DEF_METRIC) {
             b.set(AnnotationKeys.METRIC, String.valueOf(cfg.metric()));
         }
@@ -92,7 +93,7 @@
         if (cfg.isDurable() != null) {
             b.set(AnnotationKeys.DURABLE, String.valueOf(cfg.isDurable()));
         }
-        return DefaultAnnotations.union(an, b.build());
+        return b.build();
     }
 
     /**