Author: echatellier Date: 2014-04-29 11:01:07 +0200 (Tue, 29 Apr 2014) New Revision: 55 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/55 Log: refs #4657: Fix compilation Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java 2014-04-29 08:51:47 UTC (rev 54) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java 2014-04-29 09:01:07 UTC (rev 55) @@ -98,7 +98,7 @@ * @throws InvalidClientException if client code is not valid */ public Email saveEmail(Email email, FaxToMailUser user, String... modifiedFields) throws InvalidClientException { - return saveEmail(email, email.getClient().getCode(), user, modifiedFields); + return saveEmail(email, null, user, modifiedFields); } public Email saveEmail(Email email, String clientCode, FaxToMailUser user, String... modifiedFields) throws InvalidClientException { @@ -107,9 +107,13 @@ EmailTopiaDao dao = getPersistenceContext().getEmailDao(); HistoryTopiaDao historyDao = getPersistenceContext().getHistoryDao(); - Client client = clientDao.forCodeEquals(clientCode).findUniqueOrNull(); - if (client == null) { - throw new InvalidClientException("Can't find client code " + clientCode); + // if client code is null, do not manage client at all + if (clientCode != null) { + Client client = clientDao.forCodeEquals(clientCode).findUniqueOrNull(); + if (client == null) { + throw new InvalidClientException("Can't find client code " + clientCode); + } + email.setClient(client); } if (email.getAttachment() != null) {