Fix NPE in custom @InitBinder resolver initialization

rstoyanchev · rstoyanchev · commit 388e173ba3bc · 2016-11-02T10:00:19.000+02:00
Issue: SPR-14869
diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/RequestMappingHandlerAdapter.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/method/annotation/RequestMappingHandlerAdapter.java
@@ -273,7 +273,7 @@ protected List<SyncHandlerMethodArgumentResolver> getDefaultInitBinderArgumentRe
 		resolvers.add(new ServerWebExchangeArgumentResolver());
 
 		// Custom resolvers
-		if (getCustomArgumentResolvers() != null) {
+		if (getCustomInitBinderArgumentResolvers() != null) {
 			resolvers.addAll(getCustomInitBinderArgumentResolvers());
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -273,7 +273,7 @@ protected List<SyncHandlerMethodArgumentResolver> getDefaultInitBinderArgumentRe`
`273`	`273`	`resolvers.add(new ServerWebExchangeArgumentResolver());`
`274`	`274`
`275`	`275`	`// Custom resolvers`
`276`		`- if (getCustomArgumentResolvers() != null) {`
	`276`	`+ if (getCustomInitBinderArgumentResolvers() != null) {`
`277`	`277`	`resolvers.addAll(getCustomInitBinderArgumentResolvers());`
`278`	`278`	`}`
`279`	`279`