1 files changed, 3 insertions, 1 deletions
diff --git a/test/framework/src/main/java/org/elasticsearch/transport/nio/channel/ConnectFuture.java b/test/framework/src/main/java/org/elasticsearch/transport/nio/channel/ConnectFuture.java
index 4bc1ca6043..1675c7326e 100644
--- a/test/framework/src/main/java/org/elasticsearch/transport/nio/channel/ConnectFuture.java
+++ b/test/framework/src/main/java/org/elasticsearch/transport/nio/channel/ConnectFuture.java
@@ -80,12 +80,14 @@ public class ConnectFuture extends BaseFuture<NioSocketChannel> {
         if (isDone()) {
             try {
                 // Get should always return without blocking as we already checked 'isDone'
-                return super.get();
+                return super.get(0, TimeUnit.NANOSECONDS);
             } catch (InterruptedException e) {
                 Thread.currentThread().interrupt();
                 return null;
             } catch (ExecutionException e) {
                 return null;
+            } catch (TimeoutException e) {
+                throw new AssertionError("This should never happen as we only call get() after isDone() is true.");
             }
         } else {
             return null;