Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -417,8 +417,8 @@ public RepeatStatus doInTransaction(TransactionStatus status) {
catch (Exception e) {
if (transactionAttribute.rollbackOn(e)) {
chunkContext.setAttribute(ChunkListener.ROLLBACK_EXCEPTION_KEY, e);
throw e;
}
throw e;
}
}
finally {
Expand Down Expand Up @@ -489,7 +489,9 @@ public RepeatStatus doInTransaction(TransactionStatus status) {
if (logger.isDebugEnabled()) {
logger.debug("Rollback for Exception: " + e.getClass().getName() + ": " + e.getMessage());
}
rollback(stepExecution);
if (transactionAttribute.rollbackOn(e)) {
rollback(stepExecution);
}
// Allow checked exceptions
throw new UncheckedTransactionException(e);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,9 @@
import org.springframework.batch.infrastructure.support.transaction.ResourcelessTransactionManager;
import org.jspecify.annotations.Nullable;
import org.springframework.transaction.TransactionException;
import org.springframework.transaction.TransactionDefinition;
import org.springframework.transaction.UnexpectedRollbackException;
import org.springframework.transaction.interceptor.RuleBasedTransactionAttribute;
import org.springframework.transaction.support.DefaultTransactionStatus;
import org.springframework.transaction.support.TransactionSynchronizationManager;

Expand Down Expand Up @@ -92,6 +94,31 @@ void testApplicationException() throws Exception {
assertEquals(FAILED.toString(), stepExecution.getExitStatus().getExitCode());
}

@Test
void testCheckedExceptionWithNoRollbackStillFailsStep() throws Exception {
final int[] invocations = new int[1];
taskletStep.setTasklet(new Tasklet() {
@Nullable
@Override
public RepeatStatus execute(StepContribution contribution, ChunkContext chunkContext) throws Exception {
invocations[0]++;
if (invocations[0] == 1) {
throw new Exception("Planned checked exception");
}
return RepeatStatus.FINISHED;
}
});
RuleBasedTransactionAttribute transactionAttribute = new RuleBasedTransactionAttribute();
transactionAttribute.setPropagationBehavior(TransactionDefinition.PROPAGATION_NOT_SUPPORTED);
taskletStep.setTransactionAttribute(transactionAttribute);

taskletStep.execute(stepExecution);

assertEquals(FAILED, stepExecution.getStatus());
assertEquals(1, invocations[0]);
assertEquals("Planned checked exception", stepExecution.getFailureExceptions().get(0).getMessage());
}

@Test
void testInterrupted() throws Exception {
taskletStep.setStepExecutionListeners(new StepExecutionListener[] { new InterruptionListener() });
Expand Down