root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch '3.4.x' 

Closes gh-45922
This commit is contained in:
Moritz Halbritter 2025-06-12 12:44:08 +02:00
parent 1cf4acfd1b 493bf08956
commit fcbe8d630e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfiguration.java
View File

@ -104,7 +104,7 @@ public class BatchAutoConfiguration {
private final PlatformTransactionManager transactionManager; private final PlatformTransactionManager transactionManager;
private final TaskExecutor taskExector; private final TaskExecutor taskExecutor;
private final BatchProperties properties; private final BatchProperties properties;
@ -123,7 +123,7 @@ public class BatchAutoConfiguration {
ObjectProvider<JobParametersConverter> jobParametersConverter) { ObjectProvider<JobParametersConverter> jobParametersConverter) {
this.dataSource = batchDataSource.getIfAvailable(() -> dataSource); this.dataSource = batchDataSource.getIfAvailable(() -> dataSource);
this.transactionManager = batchTransactionManager.getIfAvailable(() -> transactionManager); this.transactionManager = batchTransactionManager.getIfAvailable(() -> transactionManager);
this.taskExector = batchTaskExecutor.getIfAvailable(); this.taskExecutor = batchTaskExecutor.getIfAvailable();
this.properties = properties; this.properties = properties;
this.batchConversionServiceCustomizers = batchConversionServiceCustomizers.orderedStream().toList(); this.batchConversionServiceCustomizers = batchConversionServiceCustomizers.orderedStream().toList();
this.executionContextSerializer = executionContextSerializer.getIfAvailable(); this.executionContextSerializer = executionContextSerializer.getIfAvailable();
@ -180,7 +180,7 @@ public class BatchAutoConfiguration {
@Override @Override
protected TaskExecutor getTaskExecutor() { protected TaskExecutor getTaskExecutor() {
return (this.taskExector != null) ? this.taskExector : super.getTaskExecutor(); return (this.taskExecutor != null) ? this.taskExecutor : super.getTaskExecutor();
} }
} }