Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java =================================================================== diff -u -r16663 -r16664 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 16663) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 16664) @@ -362,12 +362,16 @@ @Override public void saveOrUpdate(PackingRecord packingRecord) { - objectDao.saveOrUpdate(packingRecord); + if(packingRecord != null){ + objectDao.saveOrUpdate(packingRecord); + } } @Override public void delete(PackingRecord packingRecord) { - objectDao.delete(packingRecord); + if(packingRecord != null){ + objectDao.delete(packingRecord); + } } @Override