From 25669bf85e5f2bb3f9ba5a6c9c43e149b07095a9 Mon Sep 17 00:00:00 2001
From: ian.packer <ian.packer@forgerock.com>
Date: Mon, 30 Nov 2015 15:50:55 +0000
Subject: [PATCH] OPENDJ-2327: Improve log messages on certain 'server error' disconnects

---
 opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPClientConnection.java |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPClientConnection.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPClientConnection.java
index e469ab3..c45571f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPClientConnection.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPClientConnection.java
@@ -985,12 +985,18 @@
         statTracker.updateMessageWritten(message);
       }
     }
+    catch (ClosedChannelException e)
+    {
+      logger.traceException(e);
+      disconnect(DisconnectReason.IO_ERROR, false,
+          ERR_IO_ERROR_ON_CLIENT_CONNECTION.get(getExceptionMessage(e)));
+      return;
+    }
     catch (Exception e)
     {
       logger.traceException(e);
-
-      // FIXME -- Log a message or something
-      disconnect(DisconnectReason.SERVER_ERROR, false, null);
+      disconnect(DisconnectReason.SERVER_ERROR, false,
+          ERR_UNEXPECTED_EXCEPTION_ON_CLIENT_CONNECTION.get(getExceptionMessage(e)));
       return;
     }
     finally

--
Gitblit v1.10.0