root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch '2.0.x'

This commit is contained in:
Stephane Nicoll 2018-05-22 12:51:31 +02:00
parent 699b6ce6dc a124379dd9
commit 12bbb18844
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/builder/SpringApplicationBuilder.java
View File

@ -189,7 +189,7 @@ public class SpringApplicationBuilder {
// It's not possible if embedded web server are enabled to support web contexts as
// parents because the servlets cannot be initialized at the right point in
// lifecycle.
web(false);
web(WebApplicationType.NONE);
// Probably not interested in multiple banners
bannerMode(Banner.Mode.OFF);
@ -208,8 +208,9 @@ public class SpringApplicationBuilder {
*/
public SpringApplicationBuilder parent(Class<?>... sources) {
if (this.parent == null) {
this.parent = new SpringApplicationBuilder(sources).web(false)
.properties(this.defaultProperties).environment(this.environment);
this.parent = new SpringApplicationBuilder(sources)
.web(WebApplicationType.NONE).properties(this.defaultProperties)
.environment(this.environment);
}
else {
this.parent.sources(sources);