Merge branch '1.2.x'

This commit is contained in:
Stephane Nicoll 2015-05-26 11:23:21 +02:00
commit 3423972c40
1 changed files with 3 additions and 3 deletions

View File

@ -391,9 +391,9 @@ public class ConfigFileApplicationListener implements
StringBuilder msg = new StringBuilder();
msg.append(propertySource == null ? "Skipped " : "Loaded ");
msg.append("config file ");
msg.append("'" + location + "' ");
msg.append(StringUtils.hasLength(profile) ? "for profile " + profile : "");
msg.append(resource == null || !resource.exists() ? " resource not found" : "");
msg.append("'").append(location).append("' ");
msg.append(StringUtils.hasLength(profile) ? "for profile " + profile : " ");
msg.append(resource == null || !resource.exists() ? "resource not found" : "");
this.debug.add(msg);
return propertySource;