From ea43e9de6d23aaf93ff60ff5e0850471cfe39826 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 22 May 2013 10:33:52 +0000
Subject: [PATCH] OPENDJ-918 (CR-1723) - HTTP Connection Handler - Server cannot start with horked http-config.json

---
 opends/src/server/org/opends/server/protocols/ldap/LDAPConnectionHandler.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/opends/src/server/org/opends/server/protocols/ldap/LDAPConnectionHandler.java b/opends/src/server/org/opends/server/protocols/ldap/LDAPConnectionHandler.java
index f58d39e..6cd4baa 100644
--- a/opends/src/server/org/opends/server/protocols/ldap/LDAPConnectionHandler.java
+++ b/opends/src/server/org/opends/server/protocols/ldap/LDAPConnectionHandler.java
@@ -1059,7 +1059,7 @@
               TRACER.debugCaught(DebugLogLevel.ERROR, e);
             }
 
-            logError(ERR_LDAP_CONNHANDLER_CANNOT_ACCEPT_CONNECTION.get(
+            logError(ERR_CONNHANDLER_CANNOT_ACCEPT_CONNECTION.get(friendlyName,
                 String.valueOf(currentConfig.dn()), getExceptionMessage(e)));
 
             if (lastIterationFailed)
@@ -1068,8 +1068,8 @@
               // encountered a failure. Rather than enter a potential
               // infinite loop of failures, disable this acceptor and
               // log an error.
-              Message message = ERR_LDAP_CONNHANDLER_CONSECUTIVE_ACCEPT_FAILURES
-                  .get(String.valueOf(currentConfig.dn()),
+              Message message = ERR_CONNHANDLER_CONSECUTIVE_ACCEPT_FAILURES
+                  .get(friendlyName, String.valueOf(currentConfig.dn()),
                       stackTraceToSingleLineString(e));
               logError(message);
 

--
Gitblit v1.10.0