This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit 28cfd32cb6d968e32151fdf5f0ac24e4311d1884 Author: jcouteau <couteau@codelutin.com> Date: Mon Sep 10 13:54:10 2018 +0200 Fix NPE --- .../franciaflex/faxtomail/services/service/EmailServiceImpl.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java index 1ad8116f..7624792e 100644 --- a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java +++ b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java @@ -304,15 +304,14 @@ public class EmailServiceImpl extends FaxToMailServiceSupport implements EmailSe } Collection<History> histories; - if (!email.isPersisted()) { + if (email.isPersisted()) { + histories = historyDao.forEquals("email.topiaId", email.getTopiaId()).findAll(); + } else { histories = email.getHistory(); if (histories != null) { historyDao.createAll(histories); } email = dao.create(email); - - } else { - histories = historyDao.forEquals("email.topiaId", email.getTopiaId()).findAll(); } Set<String> fieldSet = Sets.newHashSet(modifiedFields); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.