From e9d0de74e0fd6de4627599fdb0025fdac1b52d80 Mon Sep 17 00:00:00 2001 From: Julien Viet Date: Mon, 7 Oct 2019 20:40:48 +0200 Subject: [PATCH] Return the empty succeeded future when for succeeded null futures --- src/main/java/io/vertx/core/Future.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/io/vertx/core/Future.java b/src/main/java/io/vertx/core/Future.java index 24654e8fe..613f22e40 100644 --- a/src/main/java/io/vertx/core/Future.java +++ b/src/main/java/io/vertx/core/Future.java @@ -62,7 +62,11 @@ public interface Future extends AsyncResult { * @return the future */ static Future succeededFuture(T result) { - return factory.succeededFuture(result); + if (result == null) { + return factory.succeededFuture(); + } else { + return factory.succeededFuture(result); + } } /**