Merge branch '1.1.x'

This commit is contained in:
Phillip Webb
2015-01-05 11:57:38 -08:00

View File

@@ -1285,7 +1285,7 @@ If the above customization techniques are too limited, you can register the
TomcatEmbeddedServletContainerFactory factory = new TomcatEmbeddedServletContainerFactory();
factory.setPort(9000);
factory.setSessionTimeout(10, TimeUnit.MINUTES);
factory.addErrorPages(new ErrorPage(HttpStatus.404, "/notfound.html");
factory.addErrorPages(new ErrorPage(HttpStatus.NOT_FOUND, "/notfound.html");
return factory;
}
----