From 5a7236625bf3f1d7fd369c3f2601d758c60ad87d Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@vmware.com>
Date: Thu, 1 Aug 2013 23:33:18 -0700
Subject: [PATCH] Do not use property placeholder in config names

Update ConfigFileApplicationContextInitializer so that the names
property defaults to `${spring.config.name},application`. This allows
application.properties files to be loaded even when property placeholder
expansion is not enabled.

Issue: #54462910
---
 .../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 2cc0feb1c6..98e901fc05 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;