Avoid null pointer exception when comparing annotations

Change-Id: Iedcd138fb6cbc5be6bdf79890e872d1d4a9ccc82

Avoid null pointer exception when comparing annotations
Change-Id: Iedcd138fb6cbc5be6bdf79890e872d1d4a9ccc82
Marc De Leenheer
Commit 81df608444b98e883a6ae6c17ed087f29e6ce0a1 81df6084 1 parent 275ff0c0
Showing 1 changed file with 5 additions and 1 deletions
core/api/src/main/java/org/onosproject/net/AnnotationsUtil.java
--- a/core/api/src/main/java/org/onosproject/net/AnnotationsUtil.java
View file @81df608
+++ b/core/api/src/main/java/org/onosproject/net/AnnotationsUtil.java
View file @81df608
@@ -33,7 +33,11 @@ public final class AnnotationsUtil {
         }
         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;
             }
         }