Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.0.x'

Browse Source
This commit is contained in:
Stephane Nicoll
2018-07-27 00:47:09 +02:00
parent db1d3fa282 85cffd1ab5
commit 4b3c40ff10
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnProperty.java
View File

@@ -75,7 +75,8 @@ import org.springframework.core.env.Environment;
* <p>
* This condition cannot be reliably used for matching collection properties. For example,
* in the following configuration, the condition matches if {@code spring.example.values}
* is present in the {@link Environment} but does not match if {@code spring.example.values[0]} is present.
* is present in the {@link Environment} but does not match if
* {@code spring.example.values[0]} is present.
*
* <pre class="code">
* &#064;ConditionalOnProperty(prefix = "spring", name = "example.values")