Restore Java 1.6 compatibility

This commit is contained in:
Phillip Webb 2018-05-30 18:12:20 -07:00
parent 00b76490dc
commit 5243adce22
2 changed files with 2 additions and 2 deletions

View File

@ -864,7 +864,7 @@ public class ServerProperties
.getIncludeStacktrace() == ErrorProperties.IncludeStacktrace.NEVER) {
customizeErrorReportValve(factory);
}
Cookie cookie = serverProperties.getSession().getCookie();
final Cookie cookie = serverProperties.getSession().getCookie();
if (cookie.getHttpOnly() != null) {
factory.addContextCustomizers(new TomcatContextCustomizer() {

View File

@ -84,7 +84,7 @@ public class ErrorPageFilter implements Filter, ErrorPageRegistry {
private static final Set<Class<?>> CLIENT_ABORT_EXCEPTIONS;
static {
Set<Class<?>> clientAbortExceptions = new HashSet<>();
Set<Class<?>> clientAbortExceptions = new HashSet<Class<?>>();
addClassIfPresent(clientAbortExceptions,
"org.apache.catalina.connector.ClientAbortException");
CLIENT_ABORT_EXCEPTIONS = Collections.unmodifiableSet(clientAbortExceptions);