commit ff63198d93e4fa8e3061a815a57a41dda9525b99
author David Glantz <david.glantz@windstream.com> Mon Sep 20 16:11:15 2021 -0500
committer David Glantz <david.glantz@windstream.com> Thu Sep 30 20:48:01 2021 +0000
tree 10ba8390190f3c23f5e7233096e9c43ca2ec7bd1
parent c8e8e45d4669ec14da6093d38b2f566bc6ed8168

Fix to prevent a NullPointerException and instead return an invalid link.  Occurs when an intent's path is calculated and there are links that are not annotated with the key identified in the intent's AnnotationConstraint.

Change-Id: Iffb15b1f33c474f16bb8b097e2a6c04993add895
(cherry picked from commit 0b3d1aba7ebcb261ab5d2027dd08c0f691e3d88c)

core/api/src/main/java/org/onosproject/net/intent/constraint/AnnotationConstraint.java

diff --git a/core/api/src/main/java/org/onosproject/net/intent/constraint/AnnotationConstraint.java b/core/api/src/main/java/org/onosproject/net/intent/constraint/AnnotationConstraint.java
index 192eff5..fe91de3 100644
--- a/core/api/src/main/java/org/onosproject/net/intent/constraint/AnnotationConstraint.java
+++ b/core/api/src/main/java/org/onosproject/net/intent/constraint/AnnotationConstraint.java
@@ -76,9 +76,11 @@
     }
 
     private boolean isValid(Link link) {
-        double value = getAnnotatedValue(link, key);
-
-        return value <= threshold;
+        if (link.annotations().value(key) != null) {
+            return getAnnotatedValue(link, key) <= threshold;
+        } else {
+            return false;
+        }
     }
 
     // doesn't use LinkResourceService