Browse Source

Revert change to placeholders in config file initializer

pull/18/head
Dave Syer 13 years ago
parent
commit
0d19b2d9fa
  1. 2
      spring-boot/src/main/java/org/springframework/boot/context/initializer/ConfigFileApplicationContextInitializer.java

2
spring-boot/src/main/java/org/springframework/boot/context/initializer/ConfigFileApplicationContextInitializer.java

@ -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;

Loading…
Cancel
Save