|
54 | 54 | * <li>simplejavamail.defaults.bcc.address</li> |
55 | 55 | * <li>simplejavamail.defaults.poolsize</li> |
56 | 56 | * <li>simplejavamail.defaults.poolsize.keepalivetime</li> |
| 57 | + * <li>simplejavamail.defaults.poolsize-more.keepalivetime</li> |
57 | 58 | * <li>simplejavamail.defaults.connectionpool.clusterkey.uuid</li> |
58 | 59 | * <li>simplejavamail.defaults.connectionpool.coresize</li> |
59 | 60 | * <li>simplejavamail.defaults.connectionpool.maxsize</li> |
@@ -136,6 +137,7 @@ public MailerGenericBuilder<?> loadGlobalConfigAndCreateDefaultMailer( |
136 | 137 | @Nullable @Value("${simplejavamail.defaults.bcc.address:#{null}}") final String defaultBccAddress, |
137 | 138 | @Nullable @Value("${simplejavamail.defaults.poolsize:#{null}}") final String defaultPoolsize, |
138 | 139 | @Nullable @Value("${simplejavamail.defaults.poolsize.keepalivetime:#{null}}") final String defaultPoolKeepAlivetime, |
| 140 | + @Nullable @Value("${simplejavamail.defaults.poolsize-more.keepalivetime:#{null}}") final String defaultPoolKeepAlivetimeSpringBoot, |
139 | 141 | @Nullable @Value("${simplejavamail.defaults.connectionpool.clusterkey.uuid:#{null}}") final String defaultConnectionPoolCluterKey, |
140 | 142 | @Nullable @Value("${simplejavamail.defaults.connectionpool.coresize:#{null}}") final String defaultConnectionPoolCoreSize, |
141 | 143 | @Nullable @Value("${simplejavamail.defaults.connectionpool.maxsize:#{null}}") final String defaultConnectionPoolMaxSize, |
@@ -206,7 +208,11 @@ public MailerGenericBuilder<?> loadGlobalConfigAndCreateDefaultMailer( |
206 | 208 | setNullableProperty(emailProperties, Property.DEFAULT_BCC_NAME.key(), defaultBccName); |
207 | 209 | setNullableProperty(emailProperties, Property.DEFAULT_BCC_ADDRESS.key(), defaultBccAddress); |
208 | 210 | 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 | + } |
210 | 216 | setNullableProperty(emailProperties, Property.DEFAULT_CONNECTIONPOOL_CLUSTER_KEY.key(), defaultConnectionPoolCluterKey); |
211 | 217 | setNullableProperty(emailProperties, Property.DEFAULT_CONNECTIONPOOL_CORE_SIZE.key(), defaultConnectionPoolCoreSize); |
212 | 218 | setNullableProperty(emailProperties, Property.DEFAULT_CONNECTIONPOOL_MAX_SIZE.key(), defaultConnectionPoolMaxSize); |
|
0 commit comments