From 81d36161ce5367fa7aa9a5d99dc8b80eacfa7cdf Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Fri, 24 Jan 2014 14:43:46 +0000
Subject: [PATCH] Checkpoint commit for OPENDJ-1288 : Migrate I18n and logging support to i18n framework and SLF4J
---
opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPRequestHandler.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPRequestHandler.java b/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPRequestHandler.java
index 7713479..1f82d36 100644
--- a/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPRequestHandler.java
+++ b/opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPRequestHandler.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.protocols.ldap;
@@ -43,7 +44,7 @@
import java.util.LinkedList;
import java.util.List;
-import org.opends.messages.Message;
+import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.api.DirectoryThread;
import org.opends.server.api.ServerShutdownListener;
import org.opends.server.core.DirectoryServer;
@@ -134,7 +135,7 @@
TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
- Message message = ERR_LDAP_REQHANDLER_OPEN_SELECTOR_FAILED.get(
+ LocalizableMessage message = ERR_LDAP_REQHANDLER_OPEN_SELECTOR_FAILED.get(
handlerName, String.valueOf(e));
throw new InitializationException(message, e);
}
@@ -156,7 +157,7 @@
(ste.getMethodName().indexOf("poll") >= 0) &&
ioe.getMessage().equalsIgnoreCase("Invalid argument"))
{
- Message message = ERR_LDAP_REQHANDLER_DETECTED_JVM_ISSUE_CR6322825.
+ LocalizableMessage message = ERR_LDAP_REQHANDLER_DETECTED_JVM_ISSUE_CR6322825.
get(String.valueOf(ioe));
throw new InitializationException(message, ioe);
}
@@ -240,7 +241,7 @@
TRACER.debugCaught(DebugLogLevel.ERROR, e);
}
readyConnection.disconnect(DisconnectReason.PROTOCOL_ERROR, true,
- Message.raw(e.toString()));
+ LocalizableMessage.raw(e.toString()));
}
}
@@ -396,7 +397,7 @@
// This should not happen, and it would have caused our reader
// thread to die. Log a severe error.
- Message message = ERR_LDAP_REQHANDLER_UNEXPECTED_SELECT_EXCEPTION.
+ LocalizableMessage message = ERR_LDAP_REQHANDLER_UNEXPECTED_SELECT_EXCEPTION.
get(getName(), getExceptionMessage(e));
ErrorLogger.logError(message);
}
@@ -580,7 +581,7 @@
*
* @param reason The human-readable reason for the shutdown.
*/
- public void processServerShutdown(Message reason)
+ public void processServerShutdown(LocalizableMessage reason)
{
shutdownRequested = true;
selector.wakeup();
--
Gitblit v1.10.0