commit 02a417fa85c8a4febec0a588f8534afeaeb7f6e2
author Jayasree Ghosh <jghosh@partner.ciena.com> Tue Aug 30 01:24:45 2016 +0530
committer Gerrit Code Review <gerrit@onlab.us> Mon Sep 26 16:27:05 2016 +0000
tree 8a13a7ca06512c081b8b98fa65313c625d3bb9f8
parent cfcf52c3c5d3c446238e07f2cf887e4330f88cf5

ONOS-5214:Fix-For-Meter-WrongBandType-with-NPE-And-WrongUNITType-Issue


Change-Id: Ia7a56644ad55c458ef17f31b2cf7ec9b9210dd06
(cherry picked from commit 726839c57f8a5df62c5d28ec205f128f417ffef7)

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

diff --git a/core/common/src/main/java/org/onosproject/codec/impl/MeterRequestCodec.java b/core/common/src/main/java/org/onosproject/codec/impl/MeterRequestCodec.java
index a92e96e..b64fd23 100644
--- a/core/common/src/main/java/org/onosproject/codec/impl/MeterRequestCodec.java
+++ b/core/common/src/main/java/org/onosproject/codec/impl/MeterRequestCodec.java
@@ -74,7 +74,7 @@
 
         // parse unit type
         String unit = nullIsIllegal(json.get(UNIT), UNIT + MISSING_MEMBER_MESSAGE).asText();
-        Meter.Unit meterUnit;
+        Meter.Unit meterUnit = null;
 
         switch (unit) {
             case "KB_PER_SEC":
@@ -84,8 +84,7 @@
                 meterUnit = Meter.Unit.PKTS_PER_SEC;
                 break;
             default:
-                log.warn("The requested unit {} is not defined for meter.", unit);
-                return null;
+                nullIsIllegal(meterUnit, "The requested unit " + unit + " is not defined for meter.");
         }
 
         // parse meter bands