From 39ae5d2d9bf3b741e288998371267a1c7a5d73f9 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 01 Mar 2016 11:54:45 +0000
Subject: [PATCH] Made code more explicit with DnKeyFormat
---
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/DN2ID.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/DN2ID.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/DN2ID.java
index 0822136..db91f22 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/DN2ID.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/DN2ID.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2014-2015 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.backends.pluggable;
@@ -257,23 +257,23 @@
{
private final ByteStringBuilder builder;
private final ByteSequence limit;
- private boolean cursorOnParent;
+ private boolean cursorCurrentlyOnParent;
ChildrenCursor(Cursor<ByteString, ByteString> delegate)
{
super(delegate);
builder = new ByteStringBuilder(128);
- limit = delegate.isDefined() ? afterKey(delegate.getKey()) : ByteString.empty();
- cursorOnParent = true;
+ limit = delegate.isDefined() ? afterLastChildOf(delegate.getKey()) : ByteString.empty();
+ cursorCurrentlyOnParent = true;
}
@Override
public boolean next()
{
- if (cursorOnParent) {
+ if (cursorCurrentlyOnParent) {
// Go to the first children
delegate.next();
- cursorOnParent = false;
+ cursorCurrentlyOnParent = false;
} else {
// Go to the next sibling
delegate.positionToKeyOrNext(nextSibling());
@@ -299,7 +299,7 @@
SubtreeCursor(Cursor<ByteString, ByteString> delegate)
{
super(delegate);
- limit = delegate.isDefined() ? afterKey(delegate.getKey()) : ByteString.empty();
+ limit = delegate.isDefined() ? afterLastChildOf(delegate.getKey()) : ByteString.empty();
}
@Override
--
Gitblit v1.10.0