commit 520750607aad78f12a62b3696226c9b93a7cc3c2
author Ray Milkey <ray@onlab.us> Wed Feb 03 17:36:48 2016 -0800
committer Gerrit Code Review <gerrit@onlab.us> Thu Feb 04 02:07:16 2016 +0000
tree 4ac5262d3f6767a84ed34dc0cb27272c772fb907
parent 7d180c56a3556569ce6f9fc34f525038367febc2

Fix NPE when a criterion does not specify a type

Change-Id: I79a115308d703ccec9e9c147df42a6a0a5b8d6dd

core/common/src/main/java/org/onosproject/codec/impl/DecodeCriterionCodecHelper.java

diff --git a/core/common/src/main/java/org/onosproject/codec/impl/DecodeCriterionCodecHelper.java b/core/common/src/main/java/org/onosproject/codec/impl/DecodeCriterionCodecHelper.java
index cd28afc..2e01017 100644
--- a/core/common/src/main/java/org/onosproject/codec/impl/DecodeCriterionCodecHelper.java
+++ b/core/common/src/main/java/org/onosproject/codec/impl/DecodeCriterionCodecHelper.java
@@ -500,7 +500,9 @@
      * @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) {