From 388e173ba3bc4b70363f65cc4bacdd714c8b5798 Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@pivotal.io>
Date: Wed, 2 Nov 2016 10:00:19 +0200
Subject: [PATCH] Fix NPE in custom @InitBinder resolver initialization

Issue: SPR-14869
---
 .../result/method/annotation/RequestMappingHandlerAdapter.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
index 43ec18e78ec..4eff18628f5 100644
--- 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 @@ public class RequestMappingHandlerAdapter implements HandlerAdapter, BeanFactory
 		resolvers.add(new ServerWebExchangeArgumentResolver());
 
 		// Custom resolvers
-		if (getCustomArgumentResolvers() != null) {
+		if (getCustomInitBinderArgumentResolvers() != null) {
 			resolvers.addAll(getCustomInitBinderArgumentResolvers());
 		}