commit f92a2eae49af73c7ef14fd050d1b42afff6e13df
author Jian Li <pyguni@gmail.com> Wed Apr 05 16:06:06 2017 +0900
committer Ray Milkey <ray@onlab.us> Mon Apr 10 23:13:17 2017 +0000
tree f4866290b7e75f1d4322c2471be532ca1e6db7d2
parent fa69be6fc272a143f78125f0e2a7586ffde285bb

Provides null checks for mapping action and address codecs

Change-Id: I210c3516fd335fe6c551e7ed933ad304516bd8dd

apps/mappingmanagement/web/src/main/java/org/onosproject/mapping/web/codec/MappingActionCodec.java

diff --git a/apps/mappingmanagement/web/src/main/java/org/onosproject/mapping/web/codec/MappingActionCodec.java b/apps/mappingmanagement/web/src/main/java/org/onosproject/mapping/web/codec/MappingActionCodec.java
index 169d819..0ffd088 100644
--- a/apps/mappingmanagement/web/src/main/java/org/onosproject/mapping/web/codec/MappingActionCodec.java
+++ b/apps/mappingmanagement/web/src/main/java/org/onosproject/mapping/web/codec/MappingActionCodec.java
@@ -43,6 +43,10 @@
 
     @Override
     public MappingAction decode(ObjectNode json, CodecContext context) {
+        if (json == null || !json.isObject()) {
+            return null;
+        }
+
         DecodeMappingActionCodecHelper decoder =
                 new DecodeMappingActionCodecHelper(json);
         return decoder.decode();

apps/mappingmanagement/web/src/main/java/org/onosproject/mapping/web/codec/MappingAddressCodec.java

diff --git a/apps/mappingmanagement/web/src/main/java/org/onosproject/mapping/web/codec/MappingAddressCodec.java b/apps/mappingmanagement/web/src/main/java/org/onosproject/mapping/web/codec/MappingAddressCodec.java
index 0458cf5..0c6d7d9 100644
--- a/apps/mappingmanagement/web/src/main/java/org/onosproject/mapping/web/codec/MappingAddressCodec.java
+++ b/apps/mappingmanagement/web/src/main/java/org/onosproject/mapping/web/codec/MappingAddressCodec.java
@@ -46,6 +46,10 @@
 
     @Override
     public MappingAddress decode(ObjectNode json, CodecContext context) {
+        if (json == null || !json.isObject()) {
+            return null;
+        }
+
         DecodeMappingAddressCodecHelper decoder =
                             new DecodeMappingAddressCodecHelper(json);
         return decoder.decode();