From 3753ad0d9131961a66d78bc23375adccecbe7c45 Mon Sep 17 00:00:00 2001
From: carsago <ohseo8813@gmail.com>
Date: Thu, 3 Jul 2025 19:38:41 +0900
Subject: [PATCH 1/2] skip propagation check for before commit phase

Signed-off-by: carsago <ohseo8813@gmail.com>
---
 ...estrictedTransactionalEventListenerFactory.java | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/spring-tx/src/main/java/org/springframework/transaction/annotation/RestrictedTransactionalEventListenerFactory.java b/spring-tx/src/main/java/org/springframework/transaction/annotation/RestrictedTransactionalEventListenerFactory.java
index d480170357f9..def3f07509d8 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/annotation/RestrictedTransactionalEventListenerFactory.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/annotation/RestrictedTransactionalEventListenerFactory.java
@@ -20,6 +20,8 @@
 
 import org.springframework.context.ApplicationListener;
 import org.springframework.core.annotation.AnnotatedElementUtils;
+import org.springframework.transaction.event.TransactionPhase;
+import org.springframework.transaction.event.TransactionalEventListener;
 import org.springframework.transaction.event.TransactionalEventListenerFactory;
 
 /**
@@ -44,13 +46,15 @@ public ApplicationListener<?> createApplicationListener(String beanName, Class<?
 		}
 
 		if (txAnn != null) {
-			Propagation propagation = txAnn.propagation();
-			if (propagation != Propagation.REQUIRES_NEW && propagation != Propagation.NOT_SUPPORTED) {
-				throw new IllegalStateException("@TransactionalEventListener method must not be annotated with " +
-						"@Transactional unless when declared as REQUIRES_NEW or NOT_SUPPORTED: " + method);
+			TransactionalEventListener txEventListenerAnn  = AnnotatedElementUtils.findMergedAnnotation(method, TransactionalEventListener.class);
+			if (txEventListenerAnn != null && txEventListenerAnn.phase() != TransactionPhase.BEFORE_COMMIT) {
+				Propagation propagation = txAnn.propagation();
+				if (propagation != Propagation.REQUIRES_NEW && propagation != Propagation.NOT_SUPPORTED) {
+					throw new IllegalStateException("@TransactionalEventListener method must not be annotated with " +
+													"@Transactional unless when declared as REQUIRES_NEW or NOT_SUPPORTED: " + method);
+				}
 			}
 		}
 		return super.createApplicationListener(beanName, type, method);
 	}
-
 }

From 1a324a7dcc946dfcac9f952bb4baad30f9696d1e Mon Sep 17 00:00:00 2001
From: carsago <ohseo8813@gmail.com>
Date: Thu, 3 Jul 2025 17:12:23 +0900
Subject: [PATCH 2/2] add test

Signed-off-by: carsago <ohseo8813@gmail.com>
---
 ...ctionalApplicationListenerMethodAdapterTests.java | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/spring-tx/src/test/java/org/springframework/transaction/event/TransactionalApplicationListenerMethodAdapterTests.java b/spring-tx/src/test/java/org/springframework/transaction/event/TransactionalApplicationListenerMethodAdapterTests.java
index 54283661ccf7..aa32b9f37a72 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/event/TransactionalApplicationListenerMethodAdapterTests.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/event/TransactionalApplicationListenerMethodAdapterTests.java
@@ -157,6 +157,13 @@ void withAsyncTransactionalAnnotation() {
 		assertThatNoException().isThrownBy(() -> factory.createApplicationListener("test", SampleEvents.class, m));
 	}
 
+	@Test
+	void withTransactionalAnnotationBeforeCommit() {
+		RestrictedTransactionalEventListenerFactory factory = new RestrictedTransactionalEventListenerFactory();
+		Method m = ReflectionUtils.findMethod(SampleEvents.class, "withTransactionalAnnotationBeforeCommit", String.class);
+		assertThatNoException().isThrownBy(() -> factory.createApplicationListener("test", SampleEvents.class, m));
+	}
+
 	@Test
 	void withTransactionalAnnotationOnEnclosingClass() {
 		RestrictedTransactionalEventListenerFactory factory = new RestrictedTransactionalEventListenerFactory();
@@ -277,6 +284,11 @@ public void withTransactionalNotSupportedAnnotation(String data) {
 		public void withAsyncTransactionalAnnotation(String data) {
 		}
 
+		@TransactionalEventListener(phase = TransactionPhase.BEFORE_COMMIT)
+		@Transactional
+		public void withTransactionalAnnotationBeforeCommit(String data) {
+		}
+
 		@Transactional
 		static class SampleEventsWithTransactionalAnnotation {