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/api/src/main/java/org/onosproject/net/DefaultAnnotations.java

diff --git a/core/api/src/main/java/org/onosproject/net/DefaultAnnotations.java b/core/api/src/main/java/org/onosproject/net/DefaultAnnotations.java
index f86df5e..2dab3a2 100644
--- a/core/api/src/main/java/org/onosproject/net/DefaultAnnotations.java
+++ b/core/api/src/main/java/org/onosproject/net/DefaultAnnotations.java
@@ -141,6 +141,10 @@
             return annotations;
         }
 
+        if (annotations.keys().isEmpty()) {
+            return sparseAnnotations;
+        }
+
         final HashMap<String, String> newMap;
         if (annotations instanceof DefaultAnnotations) {
             newMap = copy(((DefaultAnnotations) annotations).map);