From 9f4074cd344d25a5e1485fc59cbece7ff3c84648 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Thu, 29 Jan 2009 16:22:43 +0000
Subject: [PATCH] Fix issue 3561: aliased attributes not returned properly
---
opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/SearchResultEntryProtocolOp.java | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/SearchResultEntryProtocolOp.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/SearchResultEntryProtocolOp.java
index 9325e51..fdb9ee1 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/SearchResultEntryProtocolOp.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/ldap/SearchResultEntryProtocolOp.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2006-2008 Sun Microsystems, Inc.
+ * Copyright 2006-2009 Sun Microsystems, Inc.
*/
package org.opends.server.protocols.ldap;
@@ -149,12 +149,6 @@
attributes = new LinkedList<LDAPAttribute>();
- Attribute ocAttr = searchEntry.getObjectClassAttribute();
- if (ocAttr != null)
- {
- attributes.add(new LDAPAttribute(ocAttr));
- }
-
if (ldapVersion == 2)
{
// Merge attributes having the same type into a single
@@ -281,6 +275,7 @@
*
* @return The BER type for this protocol op.
*/
+ @Override
public byte getType()
{
return OP_TYPE_SEARCH_RESULT_ENTRY;
@@ -293,6 +288,7 @@
*
* @return The name for this protocol op type.
*/
+ @Override
public String getProtocolOpName()
{
return "Search Result Entry";
@@ -306,6 +302,7 @@
*
* @return The ASN.1 element containing the encoded protocol op.
*/
+ @Override
public ASN1Element encode()
{
ArrayList<ASN1Element> elements = new ArrayList<ASN1Element>(2);
@@ -422,6 +419,7 @@
*
* @param buffer The buffer to which the string should be appended.
*/
+ @Override
public void toString(StringBuilder buffer)
{
buffer.append("SearchResultEntry(dn=");
@@ -453,6 +451,7 @@
* @param indent The number of spaces from the margin that the lines should
* be indented.
*/
+ @Override
public void toString(StringBuilder buffer, int indent)
{
StringBuilder indentBuf = new StringBuilder(indent);
--
Gitblit v1.10.0