This commit is contained in:
Spencer Gibb
2014-10-30 18:13:00 -06:00
parent f143c78212
commit d189369015

View File

@@ -64,11 +64,11 @@ public class ConfigurableEnvironmentConfiguration extends AbstractConfiguration
}
private Map<String, PropertySource<?>> getPropertySources() {
Map<String, PropertySource<?>> map = new LinkedHashMap<String, PropertySource<?>>();
MutablePropertySources sources = null;
Map<String, PropertySource<?>> map = new LinkedHashMap<>();
MutablePropertySources sources;
if (this.environment != null
&& this.environment instanceof ConfigurableEnvironment) {
sources = ((ConfigurableEnvironment) this.environment).getPropertySources();
sources = this.environment.getPropertySources();
}
else {
sources = new StandardEnvironment().getPropertySources();