From 0d19b2d9fa3d80a4e5189084e77c101f2bd3c2a2 Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@gopivotal.com>
Date: Wed, 7 Aug 2013 16:53:15 +0100
Subject: [PATCH] Revert change to placeholders in config file initializer

---
 .../initializer/ConfigFileApplicationContextInitializer.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-boot/src/main/java/org/springframework/boot/context/initializer/ConfigFileApplicationContextInitializer.java b/spring-boot/src/main/java/org/springframework/boot/context/initializer/ConfigFileApplicationContextInitializer.java
index 98e901fc05f..2cc0feb1c68 100644
--- a/spring-boot/src/main/java/org/springframework/boot/context/initializer/ConfigFileApplicationContextInitializer.java
+++ b/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:./",
 			"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;