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 dc9805a2d8470b1c8e675e419f02543db2318b1f Author: jcouteau <couteau@codelutin.com> Date: Thu Jul 12 13:54:55 2018 +0200 fixes #10030 --- .../franciaflex/faxtomail/services/service/EmailServiceImpl.java | 6 +++++- .../franciaflex/faxtomail/services/service/EmailServiceTest.java | 8 ++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) 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 813db13c..277e019c 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 @@ -400,7 +400,11 @@ public class EmailServiceImpl extends FaxToMailServiceSupport implements EmailSe try (PreparedStatement updateStatement = connection.prepareStatement("UPDATE email SET takenby = ? WHERE topiaid = ?"); PreparedStatement historyStatement = connection.prepareStatement("UPDATE history SET email = ? WHERE topiaid = ?")) { - updateStatement.setString(1, user.getTopiaId()); + if (user != null) { + updateStatement.setString(1, user.getTopiaId()); + } else { + updateStatement.setString(1, null); + } updateStatement.setString(2, email.getTopiaId()); int result = updateStatement.executeUpdate(); diff --git a/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/EmailServiceTest.java b/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/EmailServiceTest.java index 154141be..595b8dbd 100644 --- a/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/EmailServiceTest.java +++ b/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/EmailServiceTest.java @@ -322,6 +322,14 @@ public class EmailServiceTest extends AbstractFaxToMailServiceTest { Assert.assertEquals(cmarquis.getTrigraph(),emailToTest.getTakenBy().getTrigraph()); + //put back taken by to null and test it works + service.takeBy(emails, null); + + emailToTest = service.getEmailById(email.getTopiaId()); + + Assert.assertNull(emailToTest.getTakenBy()); + + //TODO should test history to } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.