Skip to content

Commit 6baa60d

Browse files
committed
Polishing
1 parent 9241039 commit 6baa60d

File tree

3 files changed

+7
-8
lines changed

3 files changed

+7
-8
lines changed

spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1664,7 +1664,7 @@ protected String determineAutowireCandidate(Map<String, Object> candidates, Depe
16641664
if (priorityCandidate != null) {
16651665
return priorityCandidate;
16661666
}
1667-
// Fallback
1667+
// Fallback: pick directly registered dependency or qualified bean name match
16681668
for (Map.Entry<String, Object> entry : candidates.entrySet()) {
16691669
String candidateName = entry.getKey();
16701670
Object beanInstance = entry.getValue();
@@ -2083,7 +2083,6 @@ public Object getIfUnique() throws BeansException {
20832083
public boolean isRequired() {
20842084
return false;
20852085
}
2086-
20872086
@Override
20882087
@Nullable
20892088
public Object resolveNotUnique(ResolvableType type, Map<String, Object> matchingBeans) {

spring-tx/src/main/java/org/springframework/transaction/reactive/TransactionSynchronizationManager.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -358,10 +358,10 @@ public void setActualTransactionActive(boolean active) {
358358
* Return whether there currently is an actual transaction active.
359359
* This indicates whether the current context is associated with an actual
360360
* transaction rather than just with active transaction synchronization.
361-
* <p>To be called by resource management code that wants to discriminate
362-
* between active transaction synchronization (with or without backing
361+
* <p>To be called by resource management code that wants to differentiate
362+
* between active transaction synchronization (with or without a backing
363363
* resource transaction; also on PROPAGATION_SUPPORTS) and an actual
364-
* transaction being active (with backing resource transaction;
364+
* transaction being active (with a backing resource transaction;
365365
* on PROPAGATION_REQUIRED, PROPAGATION_REQUIRES_NEW, etc).
366366
* @see #isSynchronizationActive()
367367
*/

spring-tx/src/main/java/org/springframework/transaction/support/TransactionSynchronizationManager.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -426,10 +426,10 @@ public static void setActualTransactionActive(boolean active) {
426426
* Return whether there currently is an actual transaction active.
427427
* This indicates whether the current thread is associated with an actual
428428
* transaction rather than just with active transaction synchronization.
429-
* <p>To be called by resource management code that wants to discriminate
430-
* between active transaction synchronization (with or without backing
429+
* <p>To be called by resource management code that wants to differentiate
430+
* between active transaction synchronization (with or without a backing
431431
* resource transaction; also on PROPAGATION_SUPPORTS) and an actual
432-
* transaction being active (with backing resource transaction;
432+
* transaction being active (with a backing resource transaction;
433433
* on PROPAGATION_REQUIRED, PROPAGATION_REQUIRES_NEW, etc).
434434
* @see #isSynchronizationActive()
435435
*/

0 commit comments

Comments
 (0)