andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[#1770] Fix NPE which was thrown if connection timeout was disabled and the connect did not finish directly when using NIO

Browse Source
This commit is contained in:
Norman Maurer 2013-08-22 12:38:56 +02:00
parent 6a2f340ec0
commit 9fd35d09a2
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
transport/src/main/java/io/netty/channel/nio/AbstractNioChannel.java
View File

@ -240,7 +240,11 @@ public abstract class AbstractNioChannel extends AbstractChannel {
connectPromise.setFailure(t); connectPromise.setFailure(t);
closeIfClosed(); closeIfClosed();
} finally { } 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; connectPromise = null;
} }
} }