@Transactional of the target class is not considered for methods defined in a superclass

spring-tx/src/main/java/org/springframework/transaction/interceptor/AbstractFallbackTransactionAttributeSource.java

@@ -171,14 +171,18 @@ protected TransactionAttribute computeTransactionAttribute(Method method, @Nulla
 		// If the target class is null, the method will be unchanged.
 		Method specificMethod = AopUtils.getMostSpecificMethod(method, targetClass);
 
-		// First try is the method in the target class.
+		// First try is the method in the declaring class.
 		TransactionAttribute txAttr = findTransactionAttribute(specificMethod);
 		if (txAttr != null) {
 			return txAttr;
 		}
 
 		// Second try is the transaction attribute on the target class.
-		txAttr = findTransactionAttribute(specificMethod.getDeclaringClass());
+		Class<?> specificTargetClass = method.getDeclaringClass();
+		if (targetClass != null) {
+			specificTargetClass = ClassUtils.getUserClass(targetClass);
+		}
+		txAttr = findTransactionAttribute(specificTargetClass);
 		if (txAttr != null && ClassUtils.isUserLevelMethod(method)) {
 			return txAttr;
 		}

spring-tx/src/test/java/org/springframework/transaction/annotation/AnnotationTransactionAttributeSourceTests.java

@@ -179,7 +179,7 @@ void labelsAreApplied() {
 	}
 
 	/**
-	 * Test that transaction attribute is inherited from class
+	 * Test that transaction attribute is inherited from class declaring the method
 	 * if not specified on method.
 	 */
 	@Test
@@ -189,6 +189,17 @@ void defaultsToClassTransactionAttribute() {
 				new NoRollbackRuleAttribute(IOException.class)));
 	}
 
+	/**
+	 * Test that transaction attribute is inherited from the target class
+	 * if not specified on method.
+	 */
+	@Test
+	void defaultsToTargetClassTransactionAttribute() {
+		TransactionAttribute actual = getTransactionAttribute(TestBean4.class, TestBean12.class, "getAge");
+		assertThat(actual).satisfies(hasRollbackRules(new RollbackRuleAttribute(Exception.class),
+				new NoRollbackRuleAttribute(IOException.class)));
+	}
+
 	@Test
 	void customClassAttributeDetected() {
 		TransactionAttribute actual = getTransactionAttribute(TestBean5.class, "getAge");
@@ -932,4 +943,9 @@ public int getAge() {
 		}
 	}
 
+
+	@Transactional
+	static class TestBean12 extends Empty {
+	}
+
 }