From 24d9e99de1468ddd1bad3230faf88d5cfab98f20 Mon Sep 17 00:00:00 2001
From: Stephane Maldini <smaldini@pivotal.io>
Date: Sat, 27 Feb 2016 21:36:31 +0000
Subject: [PATCH] Sync toCompletableFuture

---
 .../support/ReactiveStreamsToCompletableFutureConverter.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-web-reactive/src/main/java/org/springframework/core/convert/support/ReactiveStreamsToCompletableFutureConverter.java b/spring-web-reactive/src/main/java/org/springframework/core/convert/support/ReactiveStreamsToCompletableFutureConverter.java
index a20c50e1c2..707b5c8078 100644
--- a/spring-web-reactive/src/main/java/org/springframework/core/convert/support/ReactiveStreamsToCompletableFutureConverter.java
+++ b/spring-web-reactive/src/main/java/org/springframework/core/convert/support/ReactiveStreamsToCompletableFutureConverter.java
@@ -48,7 +48,7 @@ public class ReactiveStreamsToCompletableFutureConverter implements GenericConve
 			return Mono.fromCompletableFuture((CompletableFuture)source);
 		}
 		else if (CompletableFuture.class.isAssignableFrom(targetType.getResolvableType().getRawClass())) {
-			return reactor.core.converter.CompletableFutureConverter.fromSingle((Publisher) source);
+			return Mono.from((Publisher)source).toCompletableFuture();
 		}
 		return null;
 	}