From ddc5a4ca48eddf1c3212089602911594b76795ae Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 06 Aug 2013 13:14:20 +0000
Subject: [PATCH] ECLServerHandler.java: In initializeCLSearchFromDraftCN(), removed useless double assignment of draftCompat instance member. In findCookie(), created separate key local variables to query the drafCNDB to increase readability and reduce risk of errors.
---
opends/src/server/org/opends/server/replication/server/ECLServerHandler.java | 27 ++++++++++++---------------
1 files changed, 12 insertions(+), 15 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/server/ECLServerHandler.java b/opends/src/server/org/opends/server/replication/server/ECLServerHandler.java
index 33d289a..95d1913 100644
--- a/opends/src/server/org/opends/server/replication/server/ECLServerHandler.java
+++ b/opends/src/server/org/opends/server/replication/server/ECLServerHandler.java
@@ -549,8 +549,6 @@
// Any possible optimization on draft CN in the request filter ?
final String providedCookie = findCookie(startDraftCN);
- this.draftCompat = true;
-
initializeChangelogDomainCtxts(providedCookie, true);
}
catch(DirectoryException de)
@@ -602,21 +600,21 @@
return null;
}
- final int key = draftCNDb.getFirstKey();
- String crossDomainStartState = draftCNDb.getValue(key);
- draftCNDbIter = draftCNDb.generateIterator(key);
+ final int firstKey = draftCNDb.getFirstKey();
+ String crossDomainStartState = draftCNDb.getValue(firstKey);
+ draftCNDbIter = draftCNDb.generateIterator(firstKey);
return crossDomainStartState;
}
// Request filter DOES contain a startDraftCN
// Read the draftCNDb to see whether it contains startDraftCN
- int key = startDraftCN;
- String crossDomainStartState = draftCNDb.getValue(startDraftCN);
+ final int startDraftCNKey = startDraftCN;
+ String crossDomainStartState = draftCNDb.getValue(startDraftCNKey);
if (crossDomainStartState != null)
{
// found the provided startDraftCN, let's return it
- draftCNDbIter = draftCNDb.generateIterator(key);
+ draftCNDbIter = draftCNDb.generateIterator(startDraftCNKey);
return crossDomainStartState;
}
@@ -633,13 +631,12 @@
// If the startDraftCN provided is lower than the first Draft CN in
// the DB, let's use the lower limit.
- if (startDraftCN < key)
+ if (startDraftCN < firstDraftCN)
{
- key = firstDraftCN;
- crossDomainStartState = draftCNDb.getValue(key);
+ crossDomainStartState = draftCNDb.getValue(firstDraftCN);
if (crossDomainStartState != null)
{
- draftCNDbIter = draftCNDb.generateIterator(key);
+ draftCNDbIter = draftCNDb.generateIterator(firstDraftCN);
return crossDomainStartState;
}
@@ -657,9 +654,9 @@
return null;
}
- key = draftCNDb.getLastKey();
- crossDomainStartState = draftCNDb.getValue(key);
- draftCNDbIter = draftCNDb.generateIterator(key);
+ final int lastKey = draftCNDb.getLastKey();
+ crossDomainStartState = draftCNDb.getValue(lastKey);
+ draftCNDbIter = draftCNDb.generateIterator(lastKey);
return crossDomainStartState;
// TODO:ECL ... ok we'll start from the end of the draftCNDb BUT ...
--
Gitblit v1.10.0