From b53da04d63554049e5b3895321b994c9c20b140a Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Fri, 12 Apr 2013 14:45:05 +0000
Subject: [PATCH] Fix issue OPENDJ-861: Etag attribute invalid when used in conjunction with pre- and post- read controls
---
opends/src/server/org/opends/server/core/SearchOperationBasis.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/opends/src/server/org/opends/server/core/SearchOperationBasis.java b/opends/src/server/org/opends/server/core/SearchOperationBasis.java
index ef5b606..e5646eb 100644
--- a/opends/src/server/org/opends/server/core/SearchOperationBasis.java
+++ b/opends/src/server/org/opends/server/core/SearchOperationBasis.java
@@ -23,7 +23,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011 ForgeRock AS
+ * Portions Copyright 2011-2013 ForgeRock AS
*/
package org.opends.server.core;
@@ -35,6 +35,7 @@
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import java.util.concurrent.atomic.AtomicBoolean;
import org.opends.server.api.AuthenticationPolicyState;
@@ -133,7 +134,7 @@
private RawFilter rawFilter;
// The set of attributes that should be returned in matching entries.
- private LinkedHashSet<String> attributes;
+ private Set<String> attributes;
// The set of response controls for this search operation.
private List<Control> responseControls;
@@ -544,7 +545,7 @@
/**
* {@inheritDoc}
*/
- public final LinkedHashSet<String> getAttributes()
+ public final Set<String> getAttributes()
{
return attributes;
}
@@ -552,7 +553,7 @@
/**
* {@inheritDoc}
*/
- public final void setAttributes(LinkedHashSet<String> attributes)
+ public final void setAttributes(Set<String> attributes)
{
if (attributes == null)
{
--
Gitblit v1.10.0