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
c973847d
Commit
c973847d
authored
Feb 18, 2014
by
Dave Syer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert change that breaks tests in werid way
parent
b088f600
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
12 deletions
+3
-12
AbstractEmbeddedServletContainerFactory.java
...ext/embedded/AbstractEmbeddedServletContainerFactory.java
+2
-6
JettyEmbeddedServletContainerFactory.java
.../embedded/jetty/JettyEmbeddedServletContainerFactory.java
+1
-6
No files found.
spring-boot/src/main/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerFactory.java
View file @
c973847d
...
...
@@ -304,7 +304,7 @@ public abstract class AbstractEmbeddedServletContainerFactory implements
// Or maybe there is a document root in a well-known location
file
=
file
!=
null
?
file
:
getCommonDocumentRoot
();
if
(
file
==
null
&&
this
.
logger
.
isWarnEnabled
())
{
this
.
logger
.
info
(
"None of the document roots "
this
.
logger
.
debug
(
"None of the document roots "
+
Arrays
.
asList
(
COMMON_DOC_ROOTS
)
+
" point to a directory and will be ignored."
);
}
...
...
@@ -340,11 +340,7 @@ public abstract class AbstractEmbeddedServletContainerFactory implements
}
private
File
getWarFileDocumentRoot
()
{
File
file
=
getArchiveFileDocumentRoot
(
".war"
);
if
(
file
!=
null
)
{
return
file
;
}
return
getArchiveFileDocumentRoot
(
".jar"
);
return
getArchiveFileDocumentRoot
(
".war"
);
}
private
File
getCommonDocumentRoot
()
{
...
...
spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java
View file @
c973847d
...
...
@@ -131,13 +131,8 @@ public class JettyEmbeddedServletContainerFactory extends
File
root
=
getValidDocumentRoot
();
if
(
root
!=
null
)
{
try
{
if
(!
root
.
isDirectory
())
{
handler
.
setBaseResource
(
Resource
.
newClassPathResource
(
""
));
}
else
{
handler
.
setBaseResource
(
Resource
.
newResource
(
root
));
}
}
catch
(
Exception
ex
)
{
throw
new
IllegalStateException
(
ex
);
}
...
...
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