Skip to content

Commit 0cd843c

Browse files
committed
Merge branch '3.4.x'
Closes gh-43834
2 parents ec64754 + 1fed765 commit 0cd843c

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnSingleCandidate.java

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2024 the original author or authors.
2+
* Copyright 2012-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -55,7 +55,7 @@
5555
* The class type of bean that should be checked. The condition matches if a bean of
5656
* the class specified is contained in the {@link BeanFactory} and a primary candidate
5757
* exists in case of multiple instances. Beans that are not autowire candidates or
58-
* that are not default candidates are ignored.
58+
* that are not default candidates or that are fallback candidates are ignored.
5959
* <p>
6060
* This attribute may <strong>not</strong> be used in conjunction with
6161
* {@link #type()}, but it may be used instead of {@link #type()}.
@@ -71,7 +71,8 @@
7171
* The class type name of bean that should be checked. The condition matches if a bean
7272
* of the class specified is contained in the {@link BeanFactory} and a primary
7373
* candidate exists in case of multiple instances. Beans that are not autowire
74-
* candidates or that are not default candidates are ignored.
74+
* candidates or that are not default candidates or that are fallback candidates are
75+
* ignored.
7576
* <p>
7677
* This attribute may <strong>not</strong> be used in conjunction with
7778
* {@link #value()}, but it may be used instead of {@link #value()}.

0 commit comments

Comments
 (0)