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/dsml/org/opends/dsml/protocol/DSMLSearchOperation.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/opendj3-server-dev/src/dsml/org/opends/dsml/protocol/DSMLSearchOperation.java b/opendj3-server-dev/src/dsml/org/opends/dsml/protocol/DSMLSearchOperation.java
index 22945b3..760a1cd 100644
--- a/opendj3-server-dev/src/dsml/org/opends/dsml/protocol/DSMLSearchOperation.java
+++ b/opendj3-server-dev/src/dsml/org/opends/dsml/protocol/DSMLSearchOperation.java
@@ -36,7 +36,7 @@
import javax.xml.bind.JAXBElement;
-import org.opends.messages.Message;
+import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.protocols.asn1.ASN1Exception;
import org.opends.server.protocols.ldap.LDAPAttribute;
import org.opends.server.protocols.ldap.LDAPConstants;
@@ -302,7 +302,7 @@
if(sf.getInitial() == null && subAnyElements.isEmpty()
&& sf.getFinal()==null)
{
- Message message = ERR_LDAP_FILTER_DECODE_NULL.get();
+ LocalizableMessage message = ERR_LDAP_FILTER_DECODE_NULL.get();
throw new LDAPException(LDAPResultCode.PROTOCOL_ERROR, message);
}
return LDAPFilter.createSubstringFilter(sf.getName(),
@@ -547,7 +547,7 @@
do
{
int resultCode = 0;
- Message errorMessage = null;
+ LocalizableMessage errorMessage = null;
LDAPMessage responseMessage = connection.getLDAPReader().readMessage();
if(responseMessage == null)
{
@@ -556,7 +556,7 @@
// the server , we have a reason to believe that the server doesn't
// want to handle this request. Let us return unavailable error
// code to the client to cover possible cases.
- Message message = ERR_UNEXPECTED_CONNECTION_CLOSURE.get();
+ LocalizableMessage message = ERR_UNEXPECTED_CONNECTION_CLOSURE.get();
LDAPResult result = objFactory.createLDAPResult();
ResultCode code = ResultCodeFactory.create(objFactory,
LDAPResultCode.UNAVAILABLE);
--
Gitblit v1.10.0