From 3595c7aa0ade702db08d0e4af5714efc50701f5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Mon, 2 Jun 2025 16:11:41 +0200 Subject: [PATCH] Run ManagementErrorPageCustomizer after core factory customizer This commit orders ManagementErrorPageCustomizer so that is runs after ManagementWebServerFactoryCustomizer. Previously, they had the same order and could run either way. Closes gh-45728 --- .../web/servlet/WebMvcEndpointChildContextConfiguration.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/servlet/WebMvcEndpointChildContextConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/servlet/WebMvcEndpointChildContextConfiguration.java index e55b983b2c7..45ec3ac3d41 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/servlet/WebMvcEndpointChildContextConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/servlet/WebMvcEndpointChildContextConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2021 the original author or authors. + * Copyright 2012-2025 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -128,7 +128,7 @@ class WebMvcEndpointChildContextConfiguration { @Override public int getOrder() { - return 0; + return 10; // Run after ManagementWebServerFactoryCustomizer } }