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
3d3ca423
Commit
3d3ca423
authored
Nov 05, 2014
by
Phillip Webb
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '1.1.x'
parents
10d1d5df
57a4cb1a
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
AbstractEmbeddedServletContainerFactory.java
...ext/embedded/AbstractEmbeddedServletContainerFactory.java
+1
-1
No files found.
spring-boot/src/main/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerFactory.java
View file @
3d3ca423
...
@@ -66,7 +66,7 @@ public abstract class AbstractEmbeddedServletContainerFactory extends
...
@@ -66,7 +66,7 @@ public abstract class AbstractEmbeddedServletContainerFactory extends
file
=
file
!=
null
?
file
:
getExplodedWarFileDocumentRoot
();
file
=
file
!=
null
?
file
:
getExplodedWarFileDocumentRoot
();
// Or maybe there is a document root in a well-known location
// Or maybe there is a document root in a well-known location
file
=
file
!=
null
?
file
:
getCommonDocumentRoot
();
file
=
file
!=
null
?
file
:
getCommonDocumentRoot
();
if
(
file
==
null
&&
this
.
logger
.
is
Warn
Enabled
())
{
if
(
file
==
null
&&
this
.
logger
.
is
Debug
Enabled
())
{
this
.
logger
.
debug
(
"None of the document roots "
this
.
logger
.
debug
(
"None of the document roots "
+
Arrays
.
asList
(
COMMON_DOC_ROOTS
)
+
Arrays
.
asList
(
COMMON_DOC_ROOTS
)
+
" point to a directory and will be ignored."
);
+
" point to a directory and will be ignored."
);
...
...
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