Skip to content

Commit 8bf5b81

Browse files
committed
Delegate getExecutionContextSerializer() to DefaultBatchConfiguration if not provided
See spring-projectsgh-38328
1 parent a92953d commit 8bf5b81

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import org.springframework.batch.core.launch.JobLauncher;
2727
import org.springframework.batch.core.repository.ExecutionContextSerializer;
2828
import org.springframework.batch.core.repository.JobRepository;
29-
import org.springframework.batch.core.repository.dao.DefaultExecutionContextSerializer;
3029
import org.springframework.beans.factory.ObjectProvider;
3130
import org.springframework.boot.ExitCodeGenerator;
3231
import org.springframework.boot.autoconfigure.AutoConfiguration;
@@ -118,8 +117,7 @@ static class SpringBootBatchConfiguration extends DefaultBatchConfiguration {
118117
this.transactionManager = batchTransactionManager.getIfAvailable(() -> transactionManager);
119118
this.properties = properties;
120119
this.batchConversionServiceCustomizers = batchConversionServiceCustomizers.orderedStream().toList();
121-
this.executionContextSerializer = executionContextSerializer
122-
.getIfAvailable(DefaultExecutionContextSerializer::new);
120+
this.executionContextSerializer = executionContextSerializer.getIfAvailable();
123121
}
124122

125123
@Override
@@ -155,7 +153,8 @@ protected ConfigurableConversionService getConversionService() {
155153

156154
@Override
157155
protected ExecutionContextSerializer getExecutionContextSerializer() {
158-
return this.executionContextSerializer;
156+
return (this.executionContextSerializer != null) ? this.executionContextSerializer
157+
: super.getExecutionContextSerializer();
159158
}
160159

161160
}

0 commit comments

Comments
 (0)