From 427fa0913cb9a738f055904f6df776df7ff805b5 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 02 Dec 2015 15:57:04 +0000
Subject: [PATCH] Fixed NPE when searching an inexistent DN with scope SINGLE_LEVEL or SUBORDINATES + added tests
---
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/DN2ID.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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 84626de..734c14b 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
@@ -285,14 +285,14 @@
SequentialCursorDecorator<Cursor<ByteString, ByteString>, ByteString, ByteString>
{
private final ByteStringBuilder builder;
- private final ByteString limit;
+ private final ByteSequence limit;
private boolean cursorOnParent;
ChildrenCursor(Cursor<ByteString, ByteString> delegate)
{
super(delegate);
builder = new ByteStringBuilder(128);
- limit = delegate.isDefined() ? afterKey(delegate.getKey()).toByteString() : null;
+ limit = delegate.isDefined() ? afterKey(delegate.getKey()) : ByteString.empty();
cursorOnParent = true;
}
@@ -323,12 +323,12 @@
private static final class SubtreeCursor extends
SequentialCursorDecorator<Cursor<ByteString, ByteString>, ByteString, ByteString>
{
- private final ByteString limit;
+ private final ByteSequence limit;
SubtreeCursor(Cursor<ByteString, ByteString> delegate)
{
super(delegate);
- limit = delegate.isDefined() ? afterKey(delegate.getKey()).toByteString() : null;
+ limit = delegate.isDefined() ? afterKey(delegate.getKey()) : ByteString.empty();
}
@Override
--
Gitblit v1.10.0