From 6480bb857bee37b8780cd4bd6306c05c4044fca6 Mon Sep 17 00:00:00 2001
From: Danny van Heumen <danny@dannyvanheumen.nl>
Date: Wed, 5 Mar 2014 22:55:24 +0100
Subject: [PATCH] Catch possible ChannelClosedException upon disconnecting.

---
 .../communicator/impl/protocol/irc/IrcStack.java    | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/net/java/sip/communicator/impl/protocol/irc/IrcStack.java b/src/net/java/sip/communicator/impl/protocol/irc/IrcStack.java
index 61831aca2..ae2ca19ac 100644
--- a/src/net/java/sip/communicator/impl/protocol/irc/IrcStack.java
+++ b/src/net/java/sip/communicator/impl/protocol/irc/IrcStack.java
@@ -283,9 +283,16 @@ public void disconnect()
         synchronized (this.irc)
         {
             // Disconnect and clean up
-            // FIXME Currently might throw ChannelClosedException since this is
-            // not correctly handled inside irc-api.
-            this.irc.disconnect();
+            try
+            {
+                this.irc.disconnect();
+            }
+            catch (RuntimeException e)
+            {
+                // Disconnect might throw ChannelClosedException. Shouldn't be a
+                // problem, but for now lets log it just to be sure.
+                LOGGER.debug("exception occurred while disconnecting", e);
+            }
             this.irc = null;
             this.connectionState = null;
         }