Fix NPE when a criterion does not specify a type

Change-Id: I79a115308d703ccec9e9c147df42a6a0a5b8d6dd

Fix NPE when a criterion does not specify a type
Change-Id: I79a115308d703ccec9e9c147df42a6a0a5b8d6dd
Ray Milkey · Gerrit Code Review
Commit 520750607aad78f12a62b3696226c9b93a7cc3c2 52075060 1 parent 7d180c56
Showing 1 changed file with 3 additions and 1 deletions
core/common/src/main/java/org/onosproject/codec/impl/DecodeCriterionCodecHelper.java
--- a/core/common/src/main/java/org/onosproject/codec/impl/DecodeCriterionCodecHelper.java
View file @5207506
+++ b/core/common/src/main/java/org/onosproject/codec/impl/DecodeCriterionCodecHelper.java
View file @5207506
@@ -500,7 +500,9 @@ public final class DecodeCriterionCodecHelper {
      * @throws IllegalArgumentException if the JSON is invalid
      */
     public Criterion decode() {
-         String type = json.get(CriterionCodec.TYPE).asText();
+         String type =
+                 nullIsIllegal(json.get(CriterionCodec.TYPE), "Type not specified")
+                         .asText();
 
         CriterionDecoder decoder = decoderMap.get(type);
         if (decoder != null) {