From eec563712148fd175c560ef7caad525cde870804 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 19 Dec 2014 14:21:23 +0000
Subject: [PATCH] Put back code automatically removed by Eclipse due to a bug in Eclipse Save Action. I really need to upgrade this Eclipse version now.

---
 opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/EntryContainer.java |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/EntryContainer.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/EntryContainer.java
index 823734d..d0f593a 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/EntryContainer.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/EntryContainer.java
@@ -31,6 +31,7 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.locks.Lock;
@@ -1350,12 +1351,14 @@
     boolean manageDsaIT = isManageDsaITOperation(searchOperation);
     boolean continueSearch = true;
 
+    // Set the starting value.
+    EntryID begin = null;
     if (pageRequest != null && pageRequest.getCookie().length() != 0)
     {
       // The cookie contains the ID of the next entry to be returned.
       try
       {
-        new EntryID(pageRequest.getCookie());
+        begin = new EntryID(pageRequest.getCookie());
       }
       catch (Exception e)
       {
@@ -1386,8 +1389,10 @@
     // Iterate through the index candidates.
     if (continueSearch)
     {
-      for (EntryID id : entryIDList)
+      for (Iterator<EntryID> it = entryIDList.iterator(begin); it.hasNext();)
       {
+        final EntryID id = it.next();
+
         Entry entry;
         try
         {

--
Gitblit v1.10.0