From fe6b7743202b99a10ba61038e4540c410b1344f3 Mon Sep 17 00:00:00 2001
From: Chris Ridd <chris.ridd@forgerock.com>
Date: Wed, 17 Oct 2012 09:26:56 +0000
Subject: [PATCH] Fix OPENDJ-611 Return something in ResultCode descr attribute
---
opends/src/dsml/org/opends/dsml/protocol/DSMLSearchOperation.java | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/opends/src/dsml/org/opends/dsml/protocol/DSMLSearchOperation.java b/opends/src/dsml/org/opends/dsml/protocol/DSMLSearchOperation.java
index e54ac1c..d002525 100644
--- a/opends/src/dsml/org/opends/dsml/protocol/DSMLSearchOperation.java
+++ b/opends/src/dsml/org/opends/dsml/protocol/DSMLSearchOperation.java
@@ -23,13 +23,12 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2012 ForgeRock AS.
*/
package org.opends.dsml.protocol;
-import org.opends.messages.Message;
-
import java.io.IOException;
import java.util.ArrayList;
import java.util.LinkedHashSet;
@@ -38,6 +37,7 @@
import javax.xml.bind.JAXBElement;
+import org.opends.messages.Message;
import org.opends.server.protocols.asn1.ASN1Exception;
import org.opends.server.protocols.ldap.LDAPAttribute;
import org.opends.server.protocols.ldap.LDAPConstants;
@@ -45,8 +45,8 @@
import org.opends.server.protocols.ldap.LDAPMessage;
import org.opends.server.protocols.ldap.LDAPResultCode;
import org.opends.server.protocols.ldap.SearchRequestProtocolOp;
-import org.opends.server.protocols.ldap.SearchResultEntryProtocolOp;
import org.opends.server.protocols.ldap.SearchResultDoneProtocolOp;
+import org.opends.server.protocols.ldap.SearchResultEntryProtocolOp;
import org.opends.server.tools.LDAPConnection;
import org.opends.server.types.ByteString;
import org.opends.server.types.DereferencePolicy;
@@ -532,8 +532,8 @@
// code to the client to cover possible cases.
Message message = ERR_UNEXPECTED_CONNECTION_CLOSURE.get();
LDAPResult result = objFactory.createLDAPResult();
- ResultCode code = objFactory.createResultCode();
- code.setCode(LDAPResultCode.UNAVAILABLE);
+ ResultCode code = ResultCodeFactory.create(objFactory,
+ LDAPResultCode.UNAVAILABLE);
result.setResultCode(code);
result.setErrorMessage(message.toString());
searchResponse.setSearchResultDone(result);
@@ -580,8 +580,7 @@
resultCode = searchOp.getResultCode();
errorMessage = searchOp.getErrorMessage();
LDAPResult result = objFactory.createLDAPResult();
- ResultCode code = objFactory.createResultCode();
- code.setCode(resultCode);
+ ResultCode code = ResultCodeFactory.create(objFactory, resultCode);
result.setResultCode(code);
result.setErrorMessage(errorMessage != null ? errorMessage.toString()
: null);
--
Gitblit v1.10.0