diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java index c7e52d1031f..d8c54764cd2 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java @@ -1664,7 +1664,7 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto if (priorityCandidate != null) { return priorityCandidate; } - // Fallback + // Fallback: pick directly registered dependency or qualified bean name match for (Map.Entry entry : candidates.entrySet()) { String candidateName = entry.getKey(); Object beanInstance = entry.getValue(); @@ -2083,7 +2083,6 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto public boolean isRequired() { return false; } - @Override @Nullable public Object resolveNotUnique(ResolvableType type, Map matchingBeans) { diff --git a/spring-tx/src/main/java/org/springframework/transaction/reactive/TransactionSynchronizationManager.java b/spring-tx/src/main/java/org/springframework/transaction/reactive/TransactionSynchronizationManager.java index 27ed7f41739..b5a1b11ebad 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/reactive/TransactionSynchronizationManager.java +++ b/spring-tx/src/main/java/org/springframework/transaction/reactive/TransactionSynchronizationManager.java @@ -358,10 +358,10 @@ public class TransactionSynchronizationManager { * Return whether there currently is an actual transaction active. * This indicates whether the current context is associated with an actual * transaction rather than just with active transaction synchronization. - *

To be called by resource management code that wants to discriminate - * between active transaction synchronization (with or without backing + *

To be called by resource management code that wants to differentiate + * between active transaction synchronization (with or without a backing * resource transaction; also on PROPAGATION_SUPPORTS) and an actual - * transaction being active (with backing resource transaction; + * transaction being active (with a backing resource transaction; * on PROPAGATION_REQUIRED, PROPAGATION_REQUIRES_NEW, etc). * @see #isSynchronizationActive() */ diff --git a/spring-tx/src/main/java/org/springframework/transaction/support/TransactionSynchronizationManager.java b/spring-tx/src/main/java/org/springframework/transaction/support/TransactionSynchronizationManager.java index ec887879959..85cd680ad8b 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/support/TransactionSynchronizationManager.java +++ b/spring-tx/src/main/java/org/springframework/transaction/support/TransactionSynchronizationManager.java @@ -426,10 +426,10 @@ public abstract class TransactionSynchronizationManager { * Return whether there currently is an actual transaction active. * This indicates whether the current thread is associated with an actual * transaction rather than just with active transaction synchronization. - *

To be called by resource management code that wants to discriminate - * between active transaction synchronization (with or without backing + *

To be called by resource management code that wants to differentiate + * between active transaction synchronization (with or without a backing * resource transaction; also on PROPAGATION_SUPPORTS) and an actual - * transaction being active (with backing resource transaction; + * transaction being active (with a backing resource transaction; * on PROPAGATION_REQUIRED, PROPAGATION_REQUIRES_NEW, etc). * @see #isSynchronizationActive() */