Merge branch '5.2.x'

spring-webflux/src/main/java/org/springframework/web/reactive/result/method/RequestMappingInfo.java

@@ -67,6 +67,8 @@ public final class RequestMappingInfo implements RequestCondition<RequestMapping
 
 	private static final ProducesRequestCondition EMPTY_PRODUCES = new ProducesRequestCondition();
 
+	private static final RequestConditionHolder EMPTY_CUSTOM = new RequestConditionHolder(null);
+
 
 	@Nullable
 	private final String name;
@@ -98,7 +100,7 @@ public final class RequestMappingInfo implements RequestCondition<RequestMapping
 		this.headersCondition = (headers != null ? headers : EMPTY_HEADERS);
 		this.consumesCondition = (consumes != null ? consumes : EMPTY_CONSUMES);
 		this.producesCondition = (produces != null ? produces : EMPTY_PRODUCES);
-		this.customConditionHolder = new RequestConditionHolder(custom);
+		this.customConditionHolder = (custom != null ? new RequestConditionHolder(custom) : EMPTY_CUSTOM);
 	}
 
 	/**

spring-webflux/src/test/java/org/springframework/web/reactive/result/condition/RequestMappingInfoTests.java

@@ -69,6 +69,7 @@ public class RequestMappingInfoTests {
 		assertThat(info.getHeadersCondition()).isSameAs(anotherInfo.getHeadersCondition());
 		assertThat(info.getConsumesCondition()).isSameAs(anotherInfo.getConsumesCondition());
 		assertThat(info.getProducesCondition()).isSameAs(anotherInfo.getProducesCondition());
+		assertThat(info.getCustomCondition()).isSameAs(anotherInfo.getCustomCondition());
 
 		RequestMappingInfo result = info.combine(anotherInfo);
 		assertThat(info.getPatternsCondition()).isSameAs(result.getPatternsCondition());
@@ -77,6 +78,7 @@ public class RequestMappingInfoTests {
 		assertThat(info.getHeadersCondition()).isSameAs(result.getHeadersCondition());
 		assertThat(info.getConsumesCondition()).isSameAs(result.getConsumesCondition());
 		assertThat(info.getProducesCondition()).isSameAs(result.getProducesCondition());
+		assertThat(info.getCustomCondition()).isSameAs(result.getCustomCondition());
 	}
 
 	@Test

spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfo.java

@@ -69,6 +69,9 @@ public final class RequestMappingInfo implements RequestCondition<RequestMapping
 
 	private static final ProducesRequestCondition EMPTY_PRODUCES = new ProducesRequestCondition();
 
+	private static final RequestConditionHolder EMPTY_CUSTOM = new RequestConditionHolder(null);
+
+
 
 	@Nullable
 	private final String name;
@@ -100,7 +103,7 @@ public final class RequestMappingInfo implements RequestCondition<RequestMapping
 		this.headersCondition = (headers != null ? headers : EMPTY_HEADERS);
 		this.consumesCondition = (consumes != null ? consumes : EMPTY_CONSUMES);
 		this.producesCondition = (produces != null ? produces : EMPTY_PRODUCES);
-		this.customConditionHolder = new RequestConditionHolder(custom);
+		this.customConditionHolder = (custom != null ? new RequestConditionHolder(custom) : EMPTY_CUSTOM);
 	}
 
 	/**

spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoTests.java

@@ -63,6 +63,7 @@ public class RequestMappingInfoTests {
 		assertThat(info.getHeadersCondition()).isSameAs(anotherInfo.getHeadersCondition());
 		assertThat(info.getConsumesCondition()).isSameAs(anotherInfo.getConsumesCondition());
 		assertThat(info.getProducesCondition()).isSameAs(anotherInfo.getProducesCondition());
+		assertThat(info.getCustomCondition()).isSameAs(anotherInfo.getCustomCondition());
 
 		RequestMappingInfo result = info.combine(anotherInfo);
 		assertThat(info.getPatternsCondition()).isSameAs(result.getPatternsCondition());
@@ -71,6 +72,7 @@ public class RequestMappingInfoTests {
 		assertThat(info.getHeadersCondition()).isSameAs(result.getHeadersCondition());
 		assertThat(info.getConsumesCondition()).isSameAs(result.getConsumesCondition());
 		assertThat(info.getProducesCondition()).isSameAs(result.getProducesCondition());
+		assertThat(info.getCustomCondition()).isSameAs(result.getCustomCondition());
 	}
 
 	@Test