From 80c58327faaa4873369f6bb949e62792c2f708e0 Mon Sep 17 00:00:00 2001
From: kenneth_suter <kenneth_suter@localhost>
Date: Wed, 15 Aug 2007 21:34:53 +0000
Subject: [PATCH] This commit is a step toward getting OpenDS internationalized. There are still issues to be resolved before we can declare that we are internationalized but this commit covers the bulk of changes needed at this time.
---
opends/src/server/org/opends/server/protocols/internal/InternalClientConnection.java | 28 ++++++++++++----------------
1 files changed, 12 insertions(+), 16 deletions(-)
diff --git a/opends/src/server/org/opends/server/protocols/internal/InternalClientConnection.java b/opends/src/server/org/opends/server/protocols/internal/InternalClientConnection.java
index 0a94e98..5c7b3f9 100644
--- a/opends/src/server/org/opends/server/protocols/internal/InternalClientConnection.java
+++ b/opends/src/server/org/opends/server/protocols/internal/InternalClientConnection.java
@@ -25,13 +25,15 @@
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
package org.opends.server.protocols.internal;
+import org.opends.messages.Message;
import static org.opends.server.config.ConfigConstants.*;
import static org.opends.server.loggers.ErrorLogger.logError;
import static org.opends.server.loggers.debug.DebugLogger.*;
-import static org.opends.server.messages.ProtocolMessages.*;
+import static org.opends.messages.ProtocolMessages.*;
+
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.getExceptionMessage;
@@ -69,8 +71,8 @@
import org.opends.server.types.DirectoryException;
import org.opends.server.types.DisconnectReason;
import org.opends.server.types.Entry;
-import org.opends.server.types.ErrorLogCategory;
-import org.opends.server.types.ErrorLogSeverity;
+
+
import org.opends.server.types.IntermediateResponse;
import org.opends.server.types.LDAPException;
import org.opends.server.types.Modification;
@@ -241,10 +243,8 @@
TRACER.debugCaught(DebugLogLevel.ERROR, de);
}
- logError(ErrorLogCategory.CONNECTION_HANDLING,
- ErrorLogSeverity.SEVERE_ERROR,
- MSGID_INTERNAL_CANNOT_DECODE_DN, fullDNString,
- getExceptionMessage(de));
+ logError(ERR_INTERNAL_CANNOT_DECODE_DN.get(
+ fullDNString, getExceptionMessage(de)));
}
connectionID = nextConnectionID.getAndDecrement();
@@ -1370,7 +1370,7 @@
{
throw new DirectoryException(
ResultCode.valueOf(le.getResultCode()),
- le.getErrorMessage(), le.getMessageID(), le);
+ le.getErrorMessage(), le);
}
return processSearch(new ASN1OctetString(rawBaseDN), scope,
@@ -1420,7 +1420,7 @@
{
throw new DirectoryException(
ResultCode.valueOf(le.getResultCode()),
- le.getErrorMessage(), le.getMessageID(), le);
+ le.getErrorMessage(), le);
}
return processSearch(new ASN1OctetString(rawBaseDN), scope,
@@ -1475,7 +1475,7 @@
{
throw new DirectoryException(
ResultCode.valueOf(le.getResultCode()),
- le.getErrorMessage(), le.getMessageID(), le);
+ le.getErrorMessage(), le);
}
return processSearch(new ASN1OctetString(rawBaseDN), scope,
@@ -1798,14 +1798,10 @@
* @param message The message to send to the client. It
* may be <CODE>null</CODE> if no
* notification is to be sent.
- * @param messageID The unique identifier associated with
- * the message to send to the client. It
- * may be -1 if no notification is to be
- * sent.
*/
public void disconnect(DisconnectReason disconnectReason,
- boolean sendNotification, String message,
- int messageID)
+ boolean sendNotification,
+ Message message)
{
// No implementation is required since there is nothing to
// disconnect. Further, since there is no real disconnect, we can
--
Gitblit v1.10.0