Author: echatellier Date: 2014-09-18 11:47:05 +0200 (Thu, 18 Sep 2014) New Revision: 621 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/621 Log: Fix client and edireturn jobs Modified: trunk/faxtomail-persistence/src/main/xmi/faxtomail.zargo trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java Modified: trunk/faxtomail-persistence/src/main/xmi/faxtomail.zargo =================================================================== (Binary files differ) Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java 2014-09-18 09:29:19 UTC (rev 620) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java 2014-09-18 09:47:05 UTC (rev 621) @@ -1228,8 +1228,20 @@ String error = resultSet.getString(EdiReturn.PROPERTY_ERROR); // manage email and range row - RangeRow rangeRow = rangeRowTopiaDao.forTopiaIdEquals(rangeRowTopiaId).findUnique(); - Email email = emailTopiaDao.forRangeRowContains(rangeRow).findUnique(); + RangeRow rangeRow = rangeRowTopiaDao.forTopiaIdEquals(rangeRowTopiaId).findUniqueOrNull(); + if (rangeRow == null) { + if (log.isErrorEnabled()) { + log.error("Can't find rangeRow " + rangeRowTopiaId + " to update"); + } + continue; + } + Email email = emailTopiaDao.forRangeRowContains(rangeRow).findUniqueOrNull(); + if (email == null) { + if (log.isErrorEnabled()) { + log.error("Can't find email for " + rangeRowTopiaId + " to update"); + } + continue; + } if (StringUtils.isNotBlank(error)) { //error