commit f18e66eb25b85a257a2639cc756616ce268ac546
author Yi Tseng <yi@opennetworking.org> Wed Jan 31 16:11:42 2018 -0800
committer Carmelo Cascone <carmelo@opennetworking.org> Thu Feb 01 02:39:12 2018 +0000
tree 0f833bc0a36b9dc1ddcf1e62884595fbc97813bc
parent 53a9d5b37d3a1d89a14d02a2255c02f5e2028712

[ONOS-7406] Fix NPE when annotation is null

Change-Id: I1e51e6921c938d5f3e33c64338c5d1f645b45117

cli/src/main/java/org/onosproject/cli/AbstractShellCommand.java

diff --git a/cli/src/main/java/org/onosproject/cli/AbstractShellCommand.java b/cli/src/main/java/org/onosproject/cli/AbstractShellCommand.java
index f83c5fa..09e08fa 100644
--- a/cli/src/main/java/org/onosproject/cli/AbstractShellCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/AbstractShellCommand.java
@@ -28,6 +28,7 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.onosproject.net.DefaultAnnotations;
 
 import java.util.Set;
 import java.util.TreeSet;
@@ -90,6 +91,9 @@
      * @return string image with ", k1=v1, k2=v2, ..." pairs
      */
     public static String annotations(Annotations annotations) {
+        if (annotations == null) {
+            annotations = DefaultAnnotations.EMPTY;
+        }
         StringBuilder sb = new StringBuilder();
         Set<String> keys = new TreeSet<>(annotations.keys());
         for (String key : keys) {