commit | 3315384b95838cd95da554bc206e2b5cae01d917 | [log] [tgz] |
---|---|---|
author | Ray Milkey <ray@opennetworking.org> | Wed Oct 03 10:24:51 2018 -0700 |
committer | Ray Milkey <ray@opennetworking.org> | Tue Oct 09 16:45:05 2018 +0000 |
tree | be87c3fe8465f0fe22c4298b1e9bae9accbfb911 | |
parent | e8469c2705d8fe2e1032ac8e3b678031682db7e2 [diff] [blame] |
Fix NPE when trying to reference delta port statistics via REST API Change-Id: Ic195d06e55bd4d8379ac28938e93105d6d181bf6 (cherry picked from commit 14a6c506e4c6356228bd3c801fc38dc2e26e261d)
diff --git a/core/api/src/main/java/org/onosproject/net/AbstractAnnotated.java b/core/api/src/main/java/org/onosproject/net/AbstractAnnotated.java index 9e71fbd..07bc6a7 100644 --- a/core/api/src/main/java/org/onosproject/net/AbstractAnnotated.java +++ b/core/api/src/main/java/org/onosproject/net/AbstractAnnotated.java
@@ -37,7 +37,7 @@ */ protected AbstractAnnotated(Annotations... annotations) { checkArgument(annotations.length <= 1, "Only one set of annotations is expected"); - this.annotations = annotations.length == 1 ? annotations[0] : EMPTY; + this.annotations = annotations.length == 0 || annotations[0] == null ? EMPTY : annotations[0]; } @Override