Skip to content

S
spring-boot
Commit 0d19b2d9 authored by Dave Syer's avatar Dave Syer
Browse files
Options

Revert change to placeholders in config file initializer

parent f40758c1
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
spring-boot/src/main/java/org/springframework/boot/context/initializer/ConfigFileApplicationContextInitializer.java
View file @ 0d19b2d9
...@@ -89,7 +89,7 @@ public class ConfigFileApplicationContextInitializer implements ...@@ -89,7 +89,7 @@ public class ConfigFileApplicationContextInitializer implements
private String[] searchLocations = new String[] { "classpath:", "file:./", private String[] searchLocations = new String[] { "classpath:", "file:./",
"classpath:config/", "file:./config/" }; "classpath:config/", "file:./config/" };
private String names = "${spring.config.name},application"; private String names = "${spring.config.name:application}";
private int order = Integer.MIN_VALUE + 10; private int order = Integer.MIN_VALUE + 10;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment