From 7c30dbb5403772b323df3ad907d9ed15d23b5aee Mon Sep 17 00:00:00 2001
From: ludovicp <ludovicp@localhost>
Date: Thu, 29 Apr 2010 20:35:40 +0000
Subject: [PATCH] Last batch of changes for this week. This adds support for the IETF based Password Policy for LDAP as SubEntry. Also resolves the following issues : - 4544 : initializeBackend() should not set JE env config params directly. - 4478 : ECL in draft compat mode / search lastchangenumber can be very long - 4538 : Virtual attributes not retrieved when entry cache configured - 4547 : Search Filter Matching differ for cn=Directory Manager and plain user. - 4514 : Logs shows unexpected message with replication monitoring data missing (Partial fix) - 4534 : Replication using security does not work after server restart - 4516 : SEVERE_ERROR: servers (...) have the same ServerId In addition, they also improve reliability and performance in various areas including CollectiveAttributes, Virtual Attributes and Subentries management, Schema loading, Replication...
---
opends/src/server/org/opends/server/replication/server/ReplicationServer.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/server/ReplicationServer.java b/opends/src/server/org/opends/server/replication/server/ReplicationServer.java
index 954da42..69efdd8 100644
--- a/opends/src/server/org/opends/server/replication/server/ReplicationServer.java
+++ b/opends/src/server/org/opends/server/replication/server/ReplicationServer.java
@@ -1931,11 +1931,12 @@
/**
* Get first and last DraftCN.
- * @param crossDomainEligibleCN The provided crossDomainEligibleCN used as
- * the upper limit for the lastDraftCN
- * @param excludedServiceIDs The serviceIDs that are excluded from the ECL.
- * @return The first and last draftCN.
- * @throws DirectoryException a.
+ *
+ * @param crossDomainEligibleCN The provided crossDomainEligibleCN used as
+ * the upper limit for the lastDraftCN
+ * @param excludedServiceIDs The serviceIDs that are excluded from the ECL.
+ * @return The first and last draftCN.
+ * @throws DirectoryException When it happens.
*/
public int[] getECLDraftCNLimits(
ChangeNumber crossDomainEligibleCN,
@@ -2007,6 +2008,7 @@
// for this domain, have the state in the replchangelog
// where the last DraftCN update is
+ long ec =0;
ServerState domainServerStateForLastSeqnum;
if ((domainsServerStateForLastSeqnum == null) ||
(domainsServerStateForLastSeqnum.get(rsd.getBaseDn())==null))
@@ -2017,11 +2019,12 @@
{
domainServerStateForLastSeqnum =
domainsServerStateForLastSeqnum.get(rsd.getBaseDn());
+ ec--;
}
// Count the number of (eligible) changes from this place
// to the eligible CN (cross server)
- long ec = rsd.getEligibleCount(
+ ec = rsd.getEligibleCount(
domainServerStateForLastSeqnum, crossDomainEligibleCN);
// the state from which we started is the one BEFORE the lastdraftCN
--
Gitblit v1.10.0