Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polish

Browse Source
This commit is contained in:
Andy Wilkinson
2018-05-02 12:09:50 +01:00
parent 31c6281e96
commit 06cf698387
6 changed files with 32 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainer.java
View File

@@ -208,7 +208,7 @@ public class TomcatEmbeddedServletContainer implements EmbeddedServletContainer
addPreviouslyRemovedConnectors();
Connector connector = this.tomcat.getConnector();
if (connector != null && this.autoStart) {
startConnector(connector);
performDeferredLoadOnStartup();
}
checkThatConnectorsHaveStarted();
this.started = true;
@@ -281,7 +281,7 @@ public class TomcatEmbeddedServletContainer implements EmbeddedServletContainer
}
}
private void startConnector(Connector connector) {
private void performDeferredLoadOnStartup() {
try {
for (Container child : this.tomcat.getHost().findChildren()) {
if (child instanceof TomcatEmbeddedContext) {

5
spring-boot/src/main/java/org/springframework/boot/env/PropertySourcesLoader.java vendored
View File

@@ -127,7 +127,7 @@ public class PropertySourcesLoader {
if (canLoadFileExtension(loader, resource)) {
PropertySource<?> specific = loader.load(sourceName, resource,
profile);
addPropertySource(group, specific, profile);
addPropertySource(group, specific);
return specific;
}
}
@@ -154,8 +154,7 @@ public class PropertySourcesLoader {
return false;
}
private void addPropertySource(String basename, PropertySource<?> source,
String profile) {
private void addPropertySource(String basename, PropertySource<?> source) {
if (source == null) {
return;