Author: bleny Date: 2011-01-28 09:33:14 +0000 (Fri, 28 Jan 2011) New Revision: 958 Log: don't send allegro mail when program != Obsmer Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2011-01-27 17:33:25 UTC (rev 957) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2011-01-28 09:33:14 UTC (rev 958) @@ -241,7 +241,9 @@ Contact contact = dao.findByProperties(Contact.PROPERTY_BOAT, boat, Contact.PROPERTY_MAIN_OBSERVER, user, Contact.PROPERTY_EMAIL_SENT, true); - if (contact != null) { + boolean doNotSendMail = contact != null // a mail was already sent + || newContact.getObsProgram() != ObsProgram.OBSMER; // mail is only for ObsMer + if (doNotSendMail) { // prevent re-send of the mail newContact.setEmailSent(true); }