Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into 4.0.x

Browse Source
This commit is contained in:
Moritz Halbritter
2025-06-12 12:44:16 +02:00
parent de0a19b841 fcbe8d630e
commit 42a9edc0e8
1 changed files with 3 additions and 3 deletions
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 TaskExecutor taskExector;
private final TaskExecutor taskExecutor;
private final BatchProperties properties;
@@ -123,7 +123,7 @@ public class BatchAutoConfiguration {
ObjectProvider<JobParametersConverter> jobParametersConverter) {
this.dataSource = batchDataSource.getIfAvailable(() -> dataSource);
this.transactionManager = batchTransactionManager.getIfAvailable(() -> transactionManager);
this.taskExector = batchTaskExecutor.getIfAvailable();
this.taskExecutor = batchTaskExecutor.getIfAvailable();
this.properties = properties;
this.batchConversionServiceCustomizers = batchConversionServiceCustomizers.orderedStream().toList();
this.executionContextSerializer = executionContextSerializer.getIfAvailable();
@@ -180,7 +180,7 @@ public class BatchAutoConfiguration {
@Override
protected TaskExecutor getTaskExecutor() {
return (this.taskExector != null) ? this.taskExector : super.getTaskExecutor();
return (this.taskExecutor != null) ? this.taskExecutor : super.getTaskExecutor();
}
}