Skip to content

Commit 3e9e971

Browse files
committed
#475: Added missing property that was modified (overloaded) to work with Spring Boot property config
1 parent 7dfe35e commit 3e9e971

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

modules/spring-module/src/main/java/org/simplejavamail/springsupport/SimpleJavaMailSpringSupport.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
* <li>simplejavamail.defaults.bcc.address</li>
5555
* <li>simplejavamail.defaults.poolsize</li>
5656
* <li>simplejavamail.defaults.poolsize.keepalivetime</li>
57+
* <li>simplejavamail.defaults.poolsize-more.keepalivetime</li>
5758
* <li>simplejavamail.defaults.connectionpool.clusterkey.uuid</li>
5859
* <li>simplejavamail.defaults.connectionpool.coresize</li>
5960
* <li>simplejavamail.defaults.connectionpool.maxsize</li>
@@ -136,6 +137,7 @@ public MailerGenericBuilder<?> loadGlobalConfigAndCreateDefaultMailer(
136137
@Nullable @Value("${simplejavamail.defaults.bcc.address:#{null}}") final String defaultBccAddress,
137138
@Nullable @Value("${simplejavamail.defaults.poolsize:#{null}}") final String defaultPoolsize,
138139
@Nullable @Value("${simplejavamail.defaults.poolsize.keepalivetime:#{null}}") final String defaultPoolKeepAlivetime,
140+
@Nullable @Value("${simplejavamail.defaults.poolsize-more.keepalivetime:#{null}}") final String defaultPoolKeepAlivetimeSpringBoot,
139141
@Nullable @Value("${simplejavamail.defaults.connectionpool.clusterkey.uuid:#{null}}") final String defaultConnectionPoolCluterKey,
140142
@Nullable @Value("${simplejavamail.defaults.connectionpool.coresize:#{null}}") final String defaultConnectionPoolCoreSize,
141143
@Nullable @Value("${simplejavamail.defaults.connectionpool.maxsize:#{null}}") final String defaultConnectionPoolMaxSize,
@@ -206,7 +208,11 @@ public MailerGenericBuilder<?> loadGlobalConfigAndCreateDefaultMailer(
206208
setNullableProperty(emailProperties, Property.DEFAULT_BCC_NAME.key(), defaultBccName);
207209
setNullableProperty(emailProperties, Property.DEFAULT_BCC_ADDRESS.key(), defaultBccAddress);
208210
setNullableProperty(emailProperties, Property.DEFAULT_POOL_SIZE.key(), defaultPoolsize);
209-
setNullableProperty(emailProperties, Property.DEFAULT_POOL_KEEP_ALIVE_TIME.key(), defaultPoolKeepAlivetime);
211+
if (defaultPoolKeepAlivetime != null) {
212+
setNullableProperty(emailProperties, Property.DEFAULT_POOL_KEEP_ALIVE_TIME.key(), defaultPoolKeepAlivetime);
213+
} else {
214+
setNullableProperty(emailProperties, Property.DEFAULT_POOL_KEEP_ALIVE_TIME.key(), defaultPoolKeepAlivetimeSpringBoot);
215+
}
210216
setNullableProperty(emailProperties, Property.DEFAULT_CONNECTIONPOOL_CLUSTER_KEY.key(), defaultConnectionPoolCluterKey);
211217
setNullableProperty(emailProperties, Property.DEFAULT_CONNECTIONPOOL_CORE_SIZE.key(), defaultConnectionPoolCoreSize);
212218
setNullableProperty(emailProperties, Property.DEFAULT_CONNECTIONPOOL_MAX_SIZE.key(), defaultConnectionPoolMaxSize);

0 commit comments

Comments
 (0)