Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java =================================================================== diff -u -r16735 -r16736 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 16735) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 16736) @@ -2531,11 +2531,13 @@ if(CollectionUtils.isNotEmpty(virtualBasketNameList)){ for(String virtualBasketName : virtualBasketNameList){ Container virtualContainer = (Container)objectDao.getByProperty(Container.class.getSimpleName(), "containerName", virtualBasketName); - String sql = "where status in ('"+ TousseInstance.STATUS_PACKED +"','"+ TousseInstance.STATUS_REVIEWED +"','"+ - TousseInstance.STATUS_STERILING +"','"+ TousseInstance.STATUS_STERILED +"') and virtualBasketSeqNum='" + virtualBasketName + "'"; - if(objectDao.countObjectBySql("TousseInstance", sql) == 0){ - virtualContainer.setStatus(Container.CONTAINER_STATUS_FREE); - objectDao.saveOrUpdate(virtualContainer); + if(virtualContainer != null && virtualContainer.isVirtualBasket()){ + String sql = "where status in ('"+ TousseInstance.STATUS_PACKED +"','"+ TousseInstance.STATUS_REVIEWED +"','"+ + TousseInstance.STATUS_STERILING +"','"+ TousseInstance.STATUS_STERILED +"') and virtualBasketSeqNum='" + virtualBasketName + "'"; + if(objectDao.countObjectBySql("TousseInstance", sql) == 0){ + virtualContainer.setStatus(Container.CONTAINER_STATUS_FREE); + objectDao.saveOrUpdate(virtualContainer); + } } } }