Skip to content

Commit 590e1f9

Browse files
mmoquiNicolasEYSSERIC
authored andcommitted
support #4647 : Now, when a messaging or an encoding error is thrown, the error is written into a log but no anymore raised upto the JMS system. Hence, when a SMTP error occurs, the transaction within the message notification isn't rolled back and the retry mechanism isn't then executed
1 parent 48dc14d commit 590e1f9

File tree

1 file changed

+19
-14
lines changed
  • ejb-core/channels/src/main/java/com/stratelia/silverpeas/notificationserver/channel/smtp

1 file changed

+19
-14
lines changed

ejb-core/channels/src/main/java/com/stratelia/silverpeas/notificationserver/channel/smtp/SMTPListener.java

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,35 +20,36 @@
2020
*/
2121
package com.stratelia.silverpeas.notificationserver.channel.smtp;
2222

23+
import com.silverpeas.util.EncodeHelper;
24+
import com.silverpeas.util.StringUtil;
25+
import com.silverpeas.util.i18n.I18NHelper;
26+
import com.stratelia.silverpeas.notificationserver.NotificationData;
27+
import com.stratelia.silverpeas.notificationserver.NotificationServerException;
28+
import com.stratelia.silverpeas.notificationserver.channel.AbstractListener;
29+
import com.stratelia.silverpeas.silvertrace.SilverTrace;
30+
import com.stratelia.webactiv.beans.admin.AdminReference;
31+
import com.stratelia.webactiv.util.ResourceLocator;
32+
import com.stratelia.webactiv.util.exception.SilverpeasException;
33+
import java.io.UnsupportedEncodingException;
2334
import java.util.Date;
2435
import java.util.Map;
2536
import java.util.Properties;
26-
37+
import java.util.logging.Level;
38+
import java.util.logging.Logger;
2739
import javax.ejb.ActivationConfigProperty;
2840
import javax.ejb.MessageDriven;
2941
import javax.ejb.TransactionAttribute;
3042
import javax.ejb.TransactionAttributeType;
3143
import javax.jms.MessageListener;
44+
import javax.mail.MessagingException;
3245
import javax.mail.Transport;
3346
import javax.mail.internet.AddressException;
3447
import javax.mail.internet.InternetAddress;
3548
import javax.mail.internet.MimeMessage;
36-
37-
import com.silverpeas.util.EncodeHelper;
38-
import com.silverpeas.util.StringUtil;
39-
import com.silverpeas.util.i18n.I18NHelper;
40-
41-
import com.stratelia.silverpeas.notificationserver.NotificationData;
42-
import com.stratelia.silverpeas.notificationserver.NotificationServerException;
43-
import com.stratelia.silverpeas.notificationserver.channel.AbstractListener;
44-
import com.stratelia.silverpeas.silvertrace.SilverTrace;
45-
import com.stratelia.webactiv.beans.admin.AdminReference;
46-
import com.stratelia.webactiv.util.ResourceLocator;
47-
import com.stratelia.webactiv.util.exception.SilverpeasException;
48-
4949
import org.apache.commons.lang3.CharEncoding;
5050

5151
import static com.silverpeas.util.MailUtil.*;
52+
5253
import static com.stratelia.silverpeas.notificationserver.channel.smtp.SMTPConstant.SECURE_TRANSPORT;
5354
import static com.stratelia.silverpeas.notificationserver.channel.smtp.SMTPConstant.SIMPLE_TRANSPORT;
5455

@@ -205,6 +206,10 @@ private void sendEmail(String pFrom, String personalName, String pTo, String pSu
205206
}
206207

207208
transport.sendMessage(email, toAddress);
209+
} catch (MessagingException e) {
210+
Logger.getLogger(getClass().getSimpleName()).log(Level.SEVERE, e.getMessage(), e);
211+
} catch (UnsupportedEncodingException e) {
212+
Logger.getLogger(getClass().getSimpleName()).log(Level.SEVERE, e.getMessage(), e);
208213
} catch (Exception e) {
209214
throw new NotificationServerException("SMTPListner.sendEmail()", SilverpeasException.ERROR,
210215
"smtp.EX_CANT_SEND_SMTP_MESSAGE", e);

0 commit comments

Comments
 (0)