From 9fd35d09a26e1dd060baa9d307cd69f05d6f7ae6 Mon Sep 17 00:00:00 2001
From: Norman Maurer <nmaurer@redhat.com>
Date: Thu, 22 Aug 2013 12:38:56 +0200
Subject: [PATCH] [#1770] Fix NPE which was thrown if connection timeout was
 disabled and the connect did not finish directly when using NIO

---
 .../main/java/io/netty/channel/nio/AbstractNioChannel.java  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/transport/src/main/java/io/netty/channel/nio/AbstractNioChannel.java b/transport/src/main/java/io/netty/channel/nio/AbstractNioChannel.java
index ad4f05fe6b..a30415c435 100644
--- a/transport/src/main/java/io/netty/channel/nio/AbstractNioChannel.java
+++ b/transport/src/main/java/io/netty/channel/nio/AbstractNioChannel.java
@@ -240,7 +240,11 @@ public abstract class AbstractNioChannel extends AbstractChannel {
                 connectPromise.setFailure(t);
                 closeIfClosed();
             } finally {
-                connectTimeoutFuture.cancel(false);
+                // Check for null as the connectTimeoutFuture is only created if a connectTimeoutMillis > 0 is used
+                // See https://github.com/netty/netty/issues/1770
+                if (connectTimeoutFuture != null) {
+                    connectTimeoutFuture.cancel(false);
+                }
                 connectPromise = null;
             }
         }