ONOS-4033 - 500 error when ethType is not specified

Change-Id: Ib2c440450abf94b9e93f7bdf59f9e5b1109c977f

ONOS-4033 - 500 error when ethType is not specified
Change-Id: Ib2c440450abf94b9e93f7bdf59f9e5b1109c977f
Ray Milkey · Gerrit Code Review
Commit fe447c5a1783f43bcdf79b933993f3c7a7a108f6 fe447c5a 1 parent a5e9bebf
Showing 1 changed file with 5 additions and 4 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 @fe447c5
+++ b/core/common/src/main/java/org/onosproject/codec/impl/DecodeCriterionCodecHelper.java
View file @fe447c5
@@ -107,12 +107,13 @@ public final class DecodeCriterionCodecHelper {
     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);
         }