commit 81df608444b98e883a6ae6c17ed087f29e6ce0a1
author Marc De Leenheer <marc@onlab.us> Sat Mar 05 11:02:51 2016 -0800
committer Marc De Leenheer <marc@onlab.us> Sat Mar 05 11:02:51 2016 -0800
tree ba605af6126c59203409b0d1462f8df8ca9b86fa
parent 275ff0c074292cc6f65c7f5f8e88b5a638371118

Avoid null pointer exception when comparing annotations

Change-Id: Iedcd138fb6cbc5be6bdf79890e872d1d4a9ccc82

core/api/src/main/java/org/onosproject/net/AnnotationsUtil.java

diff --git a/core/api/src/main/java/org/onosproject/net/AnnotationsUtil.java b/core/api/src/main/java/org/onosproject/net/AnnotationsUtil.java
index d43a304..4d08d9c 100644
--- a/core/api/src/main/java/org/onosproject/net/AnnotationsUtil.java
+++ b/core/api/src/main/java/org/onosproject/net/AnnotationsUtil.java
@@ -33,7 +33,11 @@
         }
 
         for (String key : lhs.keys()) {
-            if (!lhs.value(key).equals(rhs.value(key))) {
+            if (lhs.value(key) == null && rhs.value(key) != null) {
+                return false;
+            }
+
+            if (lhs.value(key) != null && !lhs.value(key).equals(rhs.value(key))) {
                 return false;
             }
         }