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

Fix NullPointerException when creating job executions for job instances without executions

Browse Source
This commit is contained in:
Henning Poettker
2020-11-03 14:34:59 +01:00
committed by Mahmoud Ben Hassine
parent 0a116824cb
commit 18ae02ab02
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/SimpleJobRepository.java
View File

@@ -116,6 +116,10 @@ public class SimpleJobRepository implements JobRepository {
List<JobExecution> executions = jobExecutionDao.findJobExecutions(jobInstance);
if (executions.isEmpty()) {
throw new IllegalStateException("Cannot find any job execution for job instance: " + jobInstance);
}
// check for running executions and find the last started
for (JobExecution execution : executions) {
if (execution.isRunning() || execution.isStopping()) {

9
spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/SimpleJobRepositoryTests.java
View File

@@ -27,6 +27,7 @@ import static org.mockito.Mockito.when;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.Date;
import java.util.List;
@@ -274,6 +275,14 @@ public class SimpleJobRepositoryTests {
jobRepository.createJobExecution("foo", new JobParameters());
}
@Test(expected = IllegalStateException.class)
public void testCreateJobExecutionInstanceWithoutExecutions() throws Exception {
when(jobInstanceDao.getJobInstance("foo", new JobParameters())).thenReturn(jobInstance);
when(jobExecutionDao.findJobExecutions(jobInstance)).thenReturn(Collections.emptyList());
jobRepository.createJobExecution("foo", new JobParameters());
}
@Test
public void testGetStepExecutionCount() {
// Given