From d173aa69aa10b80eb38c07662075817a4fef6797 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 14 Mar 2014 20:01:18 +0000
Subject: [PATCH] Fixed broken test TestBackendImpl.
---
opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryIDSet.java | 34 +++++++---------------------------
1 files changed, 7 insertions(+), 27 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryIDSet.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryIDSet.java
index 312e056..0cf2cd6 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryIDSet.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/EntryIDSet.java
@@ -39,7 +39,6 @@
public class EntryIDSet implements Iterable<EntryID>
{
-
/**
* The IDs are stored here in an array in ascending order.
* A null array implies not defined, rather than zero IDs.
@@ -118,7 +117,8 @@
{
// Entry limit has exceeded and there is an encoded undefined set size.
values = null;
- undefinedSize = bytes.toLong();
+ undefinedSize =
+ JebFormat.entryIDUndefinedSizeFromDatabase(bytes.toByteArray());
}
else
{
@@ -126,7 +126,6 @@
// list of entry IDs.
values = JebFormat.entryIDListFromDatabase(bytes.toByteArray());
}
-
}
/**
@@ -154,7 +153,6 @@
public static EntryIDSet unionOfSets(ArrayList<EntryIDSet> sets,
boolean allowDuplicates)
{
- boolean needSort = false;
int count = 0;
boolean undefined = false;
@@ -179,6 +177,7 @@
return new EntryIDSet(count);
}
+ boolean needSort = false;
long[] n = new long[count];
int pos = 0;
for (EntryIDSet l : sets)
@@ -232,14 +231,11 @@
*/
public long size()
{
- if (values == null)
- {
- return undefinedSize;
- }
- else
+ if (values != null)
{
return values.length;
}
+ return undefinedSize;
}
/**
@@ -432,27 +428,11 @@
}
long id = entryID.longValue();
- if (values.length == 0)
+ if (values.length == 0 || id > values[values.length - 1])
{
return false;
}
-
- if (id > values[values.length-1])
- {
- return false;
- }
- else
- {
- int pos = Arrays.binarySearch(values, id);
- if (pos >= 0)
- {
- return true;
- }
- else
- {
- return false;
- }
- }
+ return Arrays.binarySearch(values, id) >= 0;
}
/**
--
Gitblit v1.10.0