From fd8db4eba2ea4b7fac17a189328ea7ae66c76d2a Mon Sep 17 00:00:00 2001
From: Norman Maurer <norman@apache.org>
Date: Tue, 18 Sep 2012 21:25:29 +0200
Subject: [PATCH] Check if the remoteAddress is null before set it on
 DatagramPacket to prevent IllegalArgumentException. See #615

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

diff --git a/transport/src/main/java/io/netty/channel/socket/oio/OioDatagramChannel.java b/transport/src/main/java/io/netty/channel/socket/oio/OioDatagramChannel.java
index 6c45ad8fcb..dca7040bc6 100755
--- a/transport/src/main/java/io/netty/channel/socket/oio/OioDatagramChannel.java
+++ b/transport/src/main/java/io/netty/channel/socket/oio/OioDatagramChannel.java
@@ -205,7 +205,10 @@ public class OioDatagramChannel extends AbstractOioMessageChannel
         DatagramPacket p = (DatagramPacket) buf.poll();
         ByteBuf data = p.data();
         int length = data.readableBytes();
-        tmpPacket.setSocketAddress(p.remoteAddress());
+        InetSocketAddress remote = p.remoteAddress();
+        if (remote != null) {
+            tmpPacket.setSocketAddress(remote);
+        }
         if (data.hasArray()) {
             tmpPacket.setData(data.array(), data.arrayOffset() + data.readerIndex(), length);
         } else {