From 7eba59d7df5556bcaacdd0dbfa45d7d224ae08d6 Mon Sep 17 00:00:00 2001 From: Eric Long Date: Fri, 10 Jun 2022 16:24:15 -0400 Subject: [PATCH] 0005334: Server not trusted when sending email --- .../org/jumpmind/symmetric/service/impl/MailService.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/MailService.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/MailService.java index 2ce92ce3ba..1fff5971ce 100644 --- a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/MailService.java +++ b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/MailService.java @@ -222,11 +222,11 @@ protected Properties getJavaMailProperties(TypedProperties typedProp) { prop.setProperty(JAVAMAIL_USE_AUTH, String.valueOf(typedProp.is(ParameterConstants.SMTP_USE_AUTH, false))); prop.setProperty(JAVAMAIL_TRUST_HOST, typedProp.is(ParameterConstants.SMTP_ALLOW_UNTRUSTED_CERT, false) ? "*" : ""); prop.setProperty(JAVAMAIL_TRUST_HOST_SSL, typedProp.is(ParameterConstants.SMTP_ALLOW_UNTRUSTED_CERT, false) ? "*" : ""); - if (StringUtils.isNotBlank(parameterService.getString(ParameterConstants.SMTP_SOCKET_FACTORY_CLASS))) { - prop.setProperty(JAVAMAIL_SOCKET_FACTORY_CLASS, parameterService.getString(ParameterConstants.SMTP_SOCKET_FACTORY_CLASS)); + if (StringUtils.isNotBlank(typedProp.get(ParameterConstants.SMTP_SOCKET_FACTORY_CLASS))) { + prop.setProperty(JAVAMAIL_SOCKET_FACTORY_CLASS, typedProp.get(ParameterConstants.SMTP_SOCKET_FACTORY_CLASS)); } - if (StringUtils.isNotBlank(parameterService.getString(ParameterConstants.SMTP_SSL_PROTOCOLS))) { - prop.setProperty(JAVAMAIL_SSL_PROTOCOLS, parameterService.getString(ParameterConstants.SMTP_SSL_PROTOCOLS)); + if (StringUtils.isNotBlank(typedProp.get(ParameterConstants.SMTP_SSL_PROTOCOLS))) { + prop.setProperty(JAVAMAIL_SSL_PROTOCOLS, typedProp.get(ParameterConstants.SMTP_SOCKET_FACTORY_CLASS)); } return prop; }