midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-3100 DB error when test mail at install process

This commit is contained in:
Carlos Ruiz 2019-02-20 16:04:03 +01:00
parent c0b2c25de3
commit 9ee5a3aa37
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
org.adempiere.base/src/org/compiere/util/EMail.java
View File

@ -155,7 +155,9 @@ public final class EMail implements Serializable
setSmtpHost(smtpHost); setSmtpHost(smtpHost);
setFrom(from); setFrom(from);
String bccAddressForAllMails = MSysConfig.getValue(MSysConfig.MAIL_SEND_BCC_TO_ADDRESS, Env.getAD_Client_ID(Env.getCtx())); String bccAddressForAllMails = null;
if (DB.isConnected())
bccAddressForAllMails = MSysConfig.getValue(MSysConfig.MAIL_SEND_BCC_TO_ADDRESS, Env.getAD_Client_ID(Env.getCtx()));
if (! Util.isEmpty(bccAddressForAllMails, true)) if (! Util.isEmpty(bccAddressForAllMails, true))
addBcc(bccAddressForAllMails); addBcc(bccAddressForAllMails);
addTo(to); addTo(to);
@ -263,13 +265,17 @@ public final class EMail implements Serializable
Session session = null; Session session = null;
try try
{ {
boolean isGmail = m_smtpHost.equalsIgnoreCase("smtp.gmail.com");
if (m_auth != null) // createAuthenticator was called if (m_auth != null) // createAuthenticator was called
props.put("mail.smtp.auth", "true"); props.put("mail.smtp.auth", "true");
if (m_smtpPort > 0) if (m_smtpPort > 0)
{ {
props.put("mail.smtp.port", String.valueOf(m_smtpPort)); props.put("mail.smtp.port", String.valueOf(m_smtpPort));
} else if (isGmail)
{
props.put("mail.smtp.port", "587");
} }
if (m_secureSmtp) if (m_secureSmtp || isGmail)
{ {
props.put("mail.smtp.starttls.enable", "true"); props.put("mail.smtp.starttls.enable", "true");
} }
@ -299,7 +305,9 @@ public final class EMail implements Serializable
m_msg.setFrom(m_from); m_msg.setFrom(m_from);
// IDEMPIERE-2104 - intended for test or dev systems to not send undesired emails // IDEMPIERE-2104 - intended for test or dev systems to not send undesired emails
boolean isDontSendToAddress = MSysConfig.getBooleanValue(MSysConfig.MAIL_DONT_SEND_TO_ADDRESS, false, Env.getAD_Client_ID(Env.getCtx())); boolean isDontSendToAddress = false;
if (DB.isConnected())
isDontSendToAddress = MSysConfig.getBooleanValue(MSysConfig.MAIL_DONT_SEND_TO_ADDRESS, false, Env.getAD_Client_ID(Env.getCtx()));
if (! isDontSendToAddress) { if (! isDontSendToAddress) {
InternetAddress[] rec = getTos(); InternetAddress[] rec = getTos();
@ -316,7 +324,9 @@ public final class EMail implements Serializable
if (m_replyTo != null) if (m_replyTo != null)
m_msg.setReplyTo(new Address[] {m_replyTo}); m_msg.setReplyTo(new Address[] {m_replyTo});
} else { } else {
String bccAddressForAllMails = MSysConfig.getValue(MSysConfig.MAIL_SEND_BCC_TO_ADDRESS, Env.getAD_Client_ID(Env.getCtx())); String bccAddressForAllMails = null;
if (DB.isConnected())
bccAddressForAllMails = MSysConfig.getValue(MSysConfig.MAIL_SEND_BCC_TO_ADDRESS, Env.getAD_Client_ID(Env.getCtx()));
if (! Util.isEmpty(bccAddressForAllMails, true)) { if (! Util.isEmpty(bccAddressForAllMails, true)) {
m_msg.setRecipients (Message.RecipientType.TO, bccAddressForAllMails); m_msg.setRecipients (Message.RecipientType.TO, bccAddressForAllMails);
} }
@ -603,7 +613,7 @@ public final class EMail implements Serializable
try try
{ {
m_from = createInternetAddress(newFrom); m_from = createInternetAddress(newFrom);
if (MSysConfig.getBooleanValue(MSysConfig.MAIL_SEND_BCC_TO_FROM, false, Env.getAD_Client_ID(Env.getCtx()))) if (DB.isConnected() && MSysConfig.getBooleanValue(MSysConfig.MAIL_SEND_BCC_TO_FROM, false, Env.getAD_Client_ID(Env.getCtx())))
addBcc(newFrom); addBcc(newFrom);
} }
catch (Exception e) catch (Exception e)

2
org.adempiere.install/src/org/compiere/install/ConfigurationData.java
View File

@ -659,7 +659,7 @@ public class ConfigurationData
props.put("mail.user", mailUser); props.put("mail.user", mailUser);
props.put("mail.smtp.auth", "true"); props.put("mail.smtp.auth", "true");
if (isGmail) { if (isGmail) {
props.put("impa.smtp.port", "993"); props.put("mail.imaps.port", "993");
props.put("mail.store.protocol", "imaps"); props.put("mail.store.protocol", "imaps");
} }