Merge branch '1.1.x'

This commit is contained in:
Phillip Webb
2014-12-10 15:24:37 -08:00

View File

@@ -82,7 +82,7 @@ import org.springframework.util.StringUtils;
public class TomcatEmbeddedServletContainerFactory extends
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;