Fix NPE which is triggered if the destory method is called

before channelOpen(..). See netty#143
ctulek · Jan 7, 2012 · 7c41284 · 7c41284
1 parent 521bf83
commit 7c41284
Showing 1 changed file with 17 additions and 11 deletions.
diff --git a/handler/src/main/java/io/netty/handler/timeout/IdleStateHandler.java b/handler/src/main/java/io/netty/handler/timeout/IdleStateHandler.java
@@ -309,17 +309,23 @@ private void initialize(ChannelHandlerContext ctx) {
 
     private void destroy(ChannelHandlerContext ctx) {
         State state = (State) ctx.getAttachment();
-        if (state.readerIdleTimeout != null) {
-            state.readerIdleTimeout.cancel();
-            state.readerIdleTimeout = null;
-        }
-        if (state.writerIdleTimeout != null) {
-            state.writerIdleTimeout.cancel();
-            state.writerIdleTimeout = null;
-        }
-        if (state.allIdleTimeout != null) {
-            state.allIdleTimeout.cancel();
-            state.allIdleTimeout = null;
+        // Check if the state was set before, it may not if the destroy method was called before the 
+        // channelOpen(...) method. 
+        //
+        // See #143
+        if (state != null) {
+            if (state.readerIdleTimeout != null) {
+                state.readerIdleTimeout.cancel();
+                state.readerIdleTimeout = null;
+            }
+            if (state.writerIdleTimeout != null) {
+                state.writerIdleTimeout.cancel();
+                state.writerIdleTimeout = null;
+            }
+            if (state.allIdleTimeout != null) {
+                state.allIdleTimeout.cancel();
+                state.allIdleTimeout = null;
+            }
         }
     }