Commit 3d3ca423 authored by Phillip Webb's avatar Phillip Webb

Merge branch '1.1.x'

parents 10d1d5df 57a4cb1a
...@@ -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.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.");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment