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/dsml/org/opends/dsml/protocol/DSMLSearchOperation.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/opends/src/dsml/org/opends/dsml/protocol/DSMLSearchOperation.java b/opends/src/dsml/org/opends/dsml/protocol/DSMLSearchOperation.java
index 2c18349..950db87 100644
--- a/opends/src/dsml/org/opends/dsml/protocol/DSMLSearchOperation.java
+++ b/opends/src/dsml/org/opends/dsml/protocol/DSMLSearchOperation.java
@@ -25,6 +25,7 @@
* Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
package org.opends.dsml.protocol;
+import org.opends.messages.Message;
@@ -169,7 +170,7 @@
do
{
int resultCode = 0;
- String errorMessage = null;
+ Message errorMessage = null;
LDAPMessage responseMessage =
connection.getLDAPReader().readMessage();
@@ -224,7 +225,8 @@
ResultCode code = objFactory.createResultCode();
code.setCode(resultCode);
result.setResultCode(code);
- result.setErrorMessage(errorMessage);
+ result.setErrorMessage(
+ errorMessage != null ? errorMessage.toString() : null);
if(searchOp.getMatchedDN() != null)
{
result.setMatchedDN(searchOp.getMatchedDN().toString());
@@ -242,9 +244,8 @@
org.opends.server.types.ResultCode rc =
org.opends.server.types.ResultCode.valueOf(resultCode);
- // FIXME.
- int msgID = 0;
- throw new LDAPException(resultCode, msgID, rc.toString());
+ // TODO: FIXME - null message
+ throw new LDAPException(resultCode, null, rc.getResultCodeName());
}
} while(opType != LDAPConstants.OP_TYPE_SEARCH_RESULT_DONE);
--
Gitblit v1.10.0