Fix to get parameters correctly when multiple job executions exist

Author: baezzys

spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcJobExecutionDao.java

@@ -71,6 +71,7 @@
  * @author Mahmoud Ben Hassine
  * @author Dimitrios Liapis
  * @author Philippe Marschall
+ * @author Jinwoo Bae
  */
 public class JdbcJobExecutionDao extends AbstractJdbcBatchMetadataDao implements JobExecutionDao, InitializingBean {
 
@@ -492,8 +493,6 @@ private final class JobExecutionRowMapper implements RowMapper<JobExecution> {
 
 		private JobInstance jobInstance;
 
-		private JobParameters jobParameters;
-
 		public JobExecutionRowMapper() {
 		}
 
@@ -505,9 +504,7 @@ public JobExecutionRowMapper(JobInstance jobInstance) {
 		public JobExecution mapRow(ResultSet rs, int rowNum) throws SQLException {
 			Long id = rs.getLong(1);
 			JobExecution jobExecution;
-			if (jobParameters == null) {
-				jobParameters = getJobParameters(id);
-			}
+			JobParameters jobParameters = getJobParameters(id);
 
 			if (jobInstance == null) {
 				jobExecution = new JobExecution(id, jobParameters);

spring-batch-core/src/test/java/org/springframework/batch/core/job/SimpleJobTests.java

@@ -40,6 +40,7 @@
 import org.springframework.batch.core.JobInstance;
 import org.springframework.batch.core.JobInterruptedException;
 import org.springframework.batch.core.JobParameters;
+import org.springframework.batch.core.JobParametersBuilder;
 import org.springframework.batch.core.Step;
 import org.springframework.batch.core.StepExecution;
 import org.springframework.batch.core.UnexpectedJobExecutionException;
@@ -68,6 +69,7 @@
  * @author Lucas Ward
  * @author Will Schipp
  * @author Mahmoud Ben Hassine
+ * @author Jinwoo Bae
  */
 class SimpleJobTests {
 
@@ -483,6 +485,43 @@ void testGetStepNotExists() {
 		assertNull(step);
 	}
 
+	@Test
+	void testGetMultipleJobParameters() throws Exception {
+		StubStep failStep = new StubStep("failStep", jobRepository);
+
+		failStep.setCallback(new Runnable() {
+			@Override
+			public void run() {
+				throw new RuntimeException("An error occurred.");
+			}
+		});
+
+		job.setName("parametersTestJob");
+		job.setSteps(Arrays.asList(new Step[] {failStep}));
+
+		JobParameters firstJobParameters = new JobParametersBuilder()
+				.addString("JobExecutionParameter", "first", false).toJobParameters();
+		JobExecution jobexecution = jobRepository.createJobExecution(job.getName(), firstJobParameters);
+		job.execute(jobexecution);
+
+		List<JobExecution> jobExecutionList = jobExplorer.getJobExecutions(jobexecution.getJobInstance());
+
+		assertEquals(jobExecutionList.size(), 1);
+		assertEquals(jobExecutionList.get(0).getJobParameters().getString("JobExecutionParameter"), "first");
+
+		JobParameters secondJobParameters = new JobParametersBuilder()
+				.addString("JobExecutionParameter", "second", false).toJobParameters();
+		jobexecution = jobRepository.createJobExecution(job.getName(), secondJobParameters);
+		job.execute(jobexecution);
+
+		jobExecutionList = jobExplorer.getJobExecutions(jobexecution.getJobInstance());
+
+		assertEquals(jobExecutionList.size(), 2);
+		assertEquals(jobExecutionList.get(0).getJobParameters().getString("JobExecutionParameter"), "second");
+		assertEquals(jobExecutionList.get(1).getJobParameters().getString("JobExecutionParameter"), "first");
+
+	}
+
 	/*
 	 * Check JobRepository to ensure status is being saved.
 	 */