Author: echatellier Date: 2011-06-29 11:35:06 +0200 (Wed, 29 Jun 2011) New Revision: 101 Url: http://chorem.org/repositories/revision/vradi/101 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 09:26:22 UTC (rev 100) +++ trunk/vradi-services/src/main/java/org/chorem/vradi/services/managers/MailingManager.java 2011-06-29 09:35:06 UTC (rev 101) @@ -375,7 +375,9 @@ Properties props = new Properties(); String imapHost = VradiServiceConfigurationHelper.getImapHost(config); if (imapHost == null) { - log.warn("imap is not configured, abording"); + if (log.isWarnEnabled()) { + log.warn("Imap is not configured, abording"); + } return; } @@ -383,11 +385,13 @@ int imapPort = VradiServiceConfigurationHelper.getImapPort(config); props.put("mail.imap.host", imapHost); props.put("mail.imap.auth", "true"); - if (mailUser != null) { - props.put("mail.imap.user", mailUser); - } else if (log.isWarnEnabled()) { - log.warn("Imap user is not defined"); + if (mailUser == null) { + if (log.isWarnEnabled()) { + log.warn("Imap user is not defined, abording"); + } + return; } + props.put("mail.imap.user", mailUser); props.put("mail.imap.port", imapPort); //props.put("mail.imap.starttls.enable", "true");