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 '1.1.x'

This commit is contained in:
Phillip Webb 2014-11-05 08:19:01 -08:00
parent 10d1d5dfb4 57a4cb1aee
commit 3d3ca42318
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot/src/main/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerFactory.java
View File

@ -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.isWarnEnabled()) { if (file == null && this.logger.isDebugEnabled()) {
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.");