commit fe447c5a1783f43bcdf79b933993f3c7a7a108f6
author Ray Milkey <ray@onlab.us> Wed Feb 24 14:17:54 2016 -0800
committer Gerrit Code Review <gerrit@onlab.us> Wed Feb 24 23:09:23 2016 +0000
tree 465f2cadf7daff6d8f5d2db488b8440070b2be46
parent a5e9bebfad6be758d8e9935f16c0fbf3b3acb1b0

ONOS-4033 - 500 error when ethType is not specified

Change-Id: Ib2c440450abf94b9e93f7bdf59f9e5b1109c977f

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 2e01017..f82bd0d 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
@@ -107,12 +107,13 @@
     private class EthTypeDecoder implements CriterionDecoder {
         @Override
         public Criterion decodeCriterion(ObjectNode json) {
+            JsonNode ethTypeNode = nullIsIllegal(json.get(CriterionCodec.ETH_TYPE),
+                                              CriterionCodec.ETH_TYPE + MISSING_MEMBER_MESSAGE);
             int ethType;
-            if (json.get(CriterionCodec.ETH_TYPE).isInt()) {
-                ethType = nullIsIllegal(json.get(CriterionCodec.ETH_TYPE),
-                                        CriterionCodec.ETH_TYPE + MISSING_MEMBER_MESSAGE).asInt();
+            if (ethTypeNode.isInt()) {
+                ethType = ethTypeNode.asInt();
             } else {
-                ethType = Integer.decode(json.get(CriterionCodec.ETH_TYPE).textValue());
+                ethType = Integer.decode(ethTypeNode.textValue());
             }
             return Criteria.matchEthType(ethType);
         }