From ddedc0e2c6e3e32209f82d5d5a740a6b59ce5d63 Mon Sep 17 00:00:00 2001
From: ludovicp <ludovicp@localhost>
Date: Mon, 31 May 2010 09:40:10 +0000
Subject: [PATCH] Fix issue #4401 - SimplePage request control is now ignored if page size is >= the search size-limit

---
 opendj-sdk/opends/src/server/org/opends/server/backends/jeb/EntryContainer.java |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/EntryContainer.java b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/EntryContainer.java
index a7bc2bf..8712bcb 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/EntryContainer.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/EntryContainer.java
@@ -910,6 +910,14 @@
         searchOperation.getResponseControls().add(control);
         return;
       }
+      if (searchOperation.getSizeLimit() > 0 &&
+        pageRequest.getSize() >= searchOperation.getSizeLimit())
+      {
+        // The RFC says : "If the page size is greater than or equal to the
+        // sizeLimit value, the server should ignore the control as the
+        // request can be satisfied in a single page"
+        pageRequest = null;
+      }
     }
 
     // Handle base-object search first.

--
Gitblit v1.10.0