Index: ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoringmanager/qualitymonitoring/service/QualityMonitoringManagerImpl.java =================================================================== diff -u -r14925 -r15087 --- ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoringmanager/qualitymonitoring/service/QualityMonitoringManagerImpl.java (.../QualityMonitoringManagerImpl.java) (revision 14925) +++ ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoringmanager/qualitymonitoring/service/QualityMonitoringManagerImpl.java (.../QualityMonitoringManagerImpl.java) (revision 15087) @@ -8,6 +8,7 @@ import java.util.Map; import net.sf.json.JSONArray; +import net.sf.json.JSONNull; import net.sf.json.JSONObject; import org.apache.commons.lang.StringUtils; @@ -390,8 +391,11 @@ } JSONArray array = JSONArray.fromObject(qualityMonitoringItems); for (Object object : array) { - QualityMonitoring item = (QualityMonitoring) JSONObject.toBean( - (JSONObject) object, QualityMonitoring.class); + QualityMonitoring item = null; + if(object != null && !(object instanceof JSONNull)){ + item = (QualityMonitoring) JSONObject.toBean( + (JSONObject) object, QualityMonitoring.class); + } if (item == null) { continue; }