From 88cc883e9499805f90fe2c5ef82ba3816dc25930 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Tue, 20 Oct 2015 14:46:09 -0700 Subject: [PATCH] Refine RequestContextFilter order Use an order relative to REQUEST_WRAPPER_FILTER_MAX_ORDER. Closes gh-2637 --- .../boot/context/web/OrderedRequestContextFilter.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/spring-boot/src/main/java/org/springframework/boot/context/web/OrderedRequestContextFilter.java b/spring-boot/src/main/java/org/springframework/boot/context/web/OrderedRequestContextFilter.java index db8f07d3a2..5fea62ffd7 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/web/OrderedRequestContextFilter.java +++ b/spring-boot/src/main/java/org/springframework/boot/context/web/OrderedRequestContextFilter.java @@ -16,6 +16,7 @@ package org.springframework.boot.context.web; +import org.springframework.boot.context.embedded.FilterRegistrationBean; import org.springframework.core.Ordered; import org.springframework.web.filter.RequestContextFilter; @@ -27,8 +28,8 @@ import org.springframework.web.filter.RequestContextFilter; */ public class OrderedRequestContextFilter extends RequestContextFilter implements Ordered { - // Order defaults to high but after Spring Session filter - private int order = Ordered.HIGHEST_PRECEDENCE + 100; + // Order defaults to after Spring Session filter + private int order = FilterRegistrationBean.REQUEST_WRAPPER_FILTER_MAX_ORDER + 5; @Override public int getOrder() {