From 480230aac62ee9449279bb92083bb4892928db56 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 04 Sep 2013 07:48:25 +0000
Subject: [PATCH] LDAPReplicationDomain.java: Fixed a small bug that I introduced in the previous commit by removing ENTRYUUID from the Set of attributes. Also, apparently "*" encodes for user attributes (and not operational).
---
opends/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java b/opends/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java
index 0064c11..955c034 100644
--- a/opends/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java
+++ b/opends/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java
@@ -98,8 +98,13 @@
AlertGenerator
{
- private static final Set<String> ALL_OPERATIONAL_ATTRS = new HashSet<String>(
- Arrays.asList(HISTORICAL_ATTRIBUTE_NAME, "*"));
+ /**
+ * Set of attributes that will return all the user attributes and the
+ * replication related operational attributes when used in a search operation.
+ */
+ private static final Set<String> USER_AND_REPL_OPERATIONAL_ATTRS =
+ new HashSet<String>(Arrays.asList(
+ HISTORICAL_ATTRIBUTE_NAME, ENTRYUUID_ATTRIBUTE_NAME, "*"));
/**
* This class is used in the session establishment phase
@@ -2301,7 +2306,7 @@
SearchScope.WHOLE_SUBTREE,
DereferencePolicy.NEVER_DEREF_ALIASES,
0, 0, false, filter,
- ALL_OPERATIONAL_ATTRS, null);
+ USER_AND_REPL_OPERATIONAL_ATTRS, null);
Entry entryToRename = null;
CSN entryToRenameCSN = null;
@@ -4581,7 +4586,7 @@
SearchScope.WHOLE_SUBTREE,
DereferencePolicy.NEVER_DEREF_ALIASES,
0, 0, false, filter,
- ALL_OPERATIONAL_ATTRS,
+ USER_AND_REPL_OPERATIONAL_ATTRS,
resultListener);
}
@@ -5362,7 +5367,7 @@
SearchScope.WHOLE_SUBTREE,
DereferencePolicy.NEVER_DEREF_ALIASES,
0, 0, false, filter,
- ALL_OPERATIONAL_ATTRS, null);
+ USER_AND_REPL_OPERATIONAL_ATTRS, null);
int count = 0;
--
Gitblit v1.10.0