Merge branch '1.1.x'
This commit is contained in:
commit
bc0132b687
|
|
@ -82,7 +82,7 @@ import org.springframework.util.StringUtils;
|
||||||
public class TomcatEmbeddedServletContainerFactory extends
|
public class TomcatEmbeddedServletContainerFactory extends
|
||||||
AbstractEmbeddedServletContainerFactory implements ResourceLoaderAware {
|
AbstractEmbeddedServletContainerFactory implements ResourceLoaderAware {
|
||||||
|
|
||||||
private static final String DEFAULT_PROTOCOL = "org.apache.coyote.http11.Http11NioProtocol";
|
public static final String DEFAULT_PROTOCOL = "org.apache.coyote.http11.Http11NioProtocol";
|
||||||
|
|
||||||
private File baseDirectory;
|
private File baseDirectory;
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue