From 1a9eb05ba0a3802d0ab784225c5a2c13a07a3b46 Mon Sep 17 00:00:00 2001
From: Norman Maurer <nmaurer@redhat.com>
Date: Sun, 15 Dec 2013 11:41:04 +0100
Subject: [PATCH] [#2065] Fix NPE in AbstractOioByteChannel during write to the
 socket

---
 .../java/io/netty/channel/oio/AbstractOioByteChannel.java    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/transport/src/main/java/io/netty/channel/oio/AbstractOioByteChannel.java b/transport/src/main/java/io/netty/channel/oio/AbstractOioByteChannel.java
index 86f312fbb8..a64da7c631 100644
--- a/transport/src/main/java/io/netty/channel/oio/AbstractOioByteChannel.java
+++ b/transport/src/main/java/io/netty/channel/oio/AbstractOioByteChannel.java
@@ -154,7 +154,10 @@ public abstract class AbstractOioByteChannel extends AbstractOioChannel {
     protected void doWrite(ChannelOutboundBuffer in) throws Exception {
         for (;;) {
             Object msg = in.current(false);
-
+            if (msg == null) {
+                // nothing left to write
+                break;
+            }
             if (msg instanceof ByteBuf) {
                 ByteBuf buf = (ByteBuf) msg;
                 while (buf.isReadable()) {