Move meta-data updates within the chunk transaction

Resolves #5199

Author: fmbenhassine

spring-batch-core/src/main/java/org/springframework/batch/core/step/item/ChunkOrientedStep.java

@@ -371,14 +371,13 @@ protected void doExecute(StepExecution stepExecution) throws Exception {
 				chunkTransactionEvent.begin();
 				StepContribution contribution = stepExecution.createStepContribution();
 				processNextChunk(transactionStatus, contribution, stepExecution);
+				this.compositeItemStream.update(stepExecution.getExecutionContext());
+				getJobRepository().updateExecutionContext(stepExecution);
+				getJobRepository().update(stepExecution);
 				chunkTransactionEvent.transactionStatus = transactionStatus.isRollbackOnly()
 						? BatchMetrics.STATUS_ROLLED_BACK : BatchMetrics.STATUS_COMMITTED;
 				chunkTransactionEvent.commit();
 			});
-
-			this.compositeItemStream.update(stepExecution.getExecutionContext());
-			getJobRepository().updateExecutionContext(stepExecution);
-			getJobRepository().update(stepExecution);
 		}
 	}