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 823168c22537e537b991f8735affe7fb8396a033 Author: jcouteau <couteau@codelutin.com> Date: Fri Aug 17 17:08:05 2018 +0200 Nettoyage code et ajout commentaire --- .../com/franciaflex/faxtomail/services/service/EmailServiceImpl.java | 4 +++- .../com/franciaflex/faxtomail/services/service/EmailServiceTest.java | 1 + 2 files changed, 4 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 da147da2..8b49df97 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 @@ -931,6 +931,7 @@ public class EmailServiceImpl extends FaxToMailServiceSupport implements EmailSe // get current lock on mail if any EmailTopiaDao emailDao = getPersistenceContext().getEmailDao(); MailLockTopiaDao mailLockDao = getPersistenceContext().getMailLockDao(); + Email email = emailDao.forTopiaIdEquals(emailId).findUnique(); MailFolderService mailFolderService = serviceContext.getMailFolderService(); @@ -958,7 +959,8 @@ public class EmailServiceImpl extends FaxToMailServiceSupport implements EmailSe // si le mail courant a un group, on déverrouille tous les mails // qui ne portent pas sur le même groupe mailLocksToRemove = mailLockDao.forLockByEquals(currentUser) - .addNotEquals(MailLock.PROPERTY_LOCK_ON + "." + Email.PROPERTY_EMAIL_GROUP, email.getEmailGroup()).findAll(); + .addNotEquals(MailLock.PROPERTY_LOCK_ON + "." + Email.PROPERTY_EMAIL_GROUP, email.getEmailGroup()) + .findAll(); } else { mailLocksToRemove = mailLockDao.forLockByEquals(currentUser).findAll(); } 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 9c764a78..0b8947a6 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 @@ -311,6 +311,7 @@ public class EmailServiceTest extends AbstractFaxToMailServiceTest { Email email = emails.get(0); + //Check we can rightfully test data Assert.assertNotEquals(cmarquis,email.getTakenBy()); service.takeBy(emails, cmarquis); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.