Skip to content

Fix getLastJobExecution to handle no job execution found and add test for this case #5390

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gideruette wants to merge 1 commit into
base: main
Choose a base branch
from
+17 −5
Open

Fix getLastJobExecution to handle no job execution found and add test for this case #5390

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions ...src/main/java/org/springframework/batch/core/repository/dao/jdbc/JdbcJobExecutionDao.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,11 +310,13 @@ public void updateJobExecution(JobExecution jobExecution) {
@Override
public JobExecution getLastJobExecution(JobInstance jobInstance) {
long jobInstanceId = jobInstance.getId();

Long lastJobExecutionId = getJdbcTemplate().queryForObject(getQuery(GET_LAST_JOB_EXECUTION_ID), Long.class,
jobInstanceId, jobInstanceId);

return lastJobExecutionId != null ? getJobExecution(lastJobExecutionId) : null;
try {
Long lastJobExecutionId = getJdbcTemplate().queryForObject(getQuery(GET_LAST_JOB_EXECUTION_ID), Long.class, jobInstanceId, jobInstanceId);
return lastJobExecutionId != null ? getJobExecution(lastJobExecutionId) : null;
}
catch (EmptyResultDataAccessException e) {
return null;
}
}

@Override
Expand Down
10 changes: 10 additions & 0 deletions ...core/src/test/java/org/springframework/batch/core/repository/dao/AbstractJobDaoTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,16 @@ void testGetLastJobExecution() {
assertEquals("jobKey", lastExecution.getJobParameters().getString("job.key"));
}

@Test
void testGetLastJobExecutionNoExecution() {

jobExecutionDao.deleteJobExecution(jobExecution);

JobExecution je = jobExecutionDao.getLastJobExecution(jobInstance);

assertNull(je);
}

/**
* Trying to create instance twice for the same job+parameters causes error
*/
Expand Down