Author: echatellier Date: 2011-06-29 11:26:22 +0200 (Wed, 29 Jun 2011) New Revision: 100 Url: http://chorem.org/repositories/revision/vradi/100 Log: Fix npe during test Modified: trunk/vradi-services/src/main/java/org/chorem/vradi/services/managers/MailingManager.java Modified: trunk/vradi-services/src/main/java/org/chorem/vradi/services/managers/MailingManager.java =================================================================== --- trunk/vradi-services/src/main/java/org/chorem/vradi/services/managers/MailingManager.java 2011-06-29 08:35:31 UTC (rev 99) +++ trunk/vradi-services/src/main/java/org/chorem/vradi/services/managers/MailingManager.java 2011-06-29 09:26:22 UTC (rev 100) @@ -383,7 +383,11 @@ int imapPort = VradiServiceConfigurationHelper.getImapPort(config); props.put("mail.imap.host", imapHost); props.put("mail.imap.auth", "true"); - props.put("mail.imap.user", mailUser); + if (mailUser != null) { + props.put("mail.imap.user", mailUser); + } else if (log.isWarnEnabled()) { + log.warn("Imap user is not defined"); + } props.put("mail.imap.port", imapPort); //props.put("mail.imap.starttls.enable", "true"); @@ -400,14 +404,14 @@ props.put("mail.store.protocol", "imap"); Session session = Session.getInstance(props, - new Authenticator() { - @Override - protected PasswordAuthentication getPasswordAuthentication() { - return new PasswordAuthentication( - mailUser, - VradiServiceConfigurationHelper.getMailPassword(config)); - } - }); + new Authenticator() { + @Override + protected PasswordAuthentication getPasswordAuthentication() { + return new PasswordAuthentication( + mailUser, + VradiServiceConfigurationHelper.getMailPassword(config)); + } + }); // Récupère la "messagerie" et se connecte Store store = session.getStore("imap");