Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
12bbb188
Commit
12bbb188
authored
May 22, 2018
by
Stephane Nicoll
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '2.0.x'
parents
699b6ce6
a124379d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
3 deletions
+4
-3
SpringApplicationBuilder.java
...pringframework/boot/builder/SpringApplicationBuilder.java
+4
-3
No files found.
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/builder/SpringApplicationBuilder.java
View file @
12bbb188
...
...
@@ -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
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment