Merge pull request apache#1541 from apache/FINERACT-1070_take-two

Better fix for SMTP Server Port (FINERACT-1070)
djamoapp · Dec 12, 2020 · 98d2857 · 98d2857
2 parents 16bd18c + d189fe8
commit 98d2857
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/...java/org/apache/fineract/infrastructure/core/service/GmailBackedPlatformEmailService.java b/...java/org/apache/fineract/infrastructure/core/service/GmailBackedPlatformEmailService.java
@@ -68,11 +68,10 @@ public void sendDefinedEmail(EmailDetail emailDetails) {
 
  try {
  if (smtpCredentialsData.isUseTLS()) {
- email.getMailSession().getProperties().put("mail.smtp.starttls.enable", "true");
- email.setSslSmtpPort(smtpCredentialsData.getPort());
- } else {
- email.setSmtpPort(Integer.parseInt(smtpCredentialsData.getPort()));
+ // FINERACT-1070: NOT email.setSSLOnConnect(true); email.setSslSmtpPort(smtpCredentialsData.getPort());
+ email.setStartTLSRequired(true);
  }
+ email.setSmtpPort(Integer.parseInt(smtpCredentialsData.getPort()));
  email.setFrom(smtpCredentialsData.getFromEmail(), smtpCredentialsData.getFromName());
 
  email.setSubject(emailDetails.getSubject());