From f029b8dc914f746b5415cc08220bad9722ce7f8b Mon Sep 17 00:00:00 2001
From: Viktor Klang <viktor.klang@gmail.com>
Date: Mon, 9 Jan 2012 14:40:57 +0100
Subject: [PATCH] Adding null-checks in shutdown of ActiveRemoteClient

---
 .../src/main/scala/akka/remote/netty/NettyRemoteSupport.scala   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/akka-remote/src/main/scala/akka/remote/netty/NettyRemoteSupport.scala b/akka-remote/src/main/scala/akka/remote/netty/NettyRemoteSupport.scala
index 2ebe26db50..d6d2698526 100644
--- a/akka-remote/src/main/scala/akka/remote/netty/NettyRemoteSupport.scala
+++ b/akka-remote/src/main/scala/akka/remote/netty/NettyRemoteSupport.scala
@@ -213,7 +213,7 @@ class ActiveRemoteClient private[akka] (
 
     notifyListeners(RemoteClientShutdown(remoteSupport, remoteAddress))
     try {
-      if (connection.getChannel ne null)
+      if ((connection ne null) && (connection.getChannel ne null))
         connection.getChannel.close()
     } finally {
       connection = null