From 35a408038c1de64a6f13f0e7b246a645e9945e3c Mon Sep 17 00:00:00 2001
From: boli <boli@localhost>
Date: Tue, 18 Mar 2008 22:44:58 +0000
Subject: [PATCH] With this refactoring:
---
opends/src/server/org/opends/server/backends/RootDSEBackend.java | 15 +++------------
1 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/opends/src/server/org/opends/server/backends/RootDSEBackend.java b/opends/src/server/org/opends/server/backends/RootDSEBackend.java
index fb1f312..13c37f1 100644
--- a/opends/src/server/org/opends/server/backends/RootDSEBackend.java
+++ b/opends/src/server/org/opends/server/backends/RootDSEBackend.java
@@ -965,8 +965,7 @@
*/
@Override()
public void search(SearchOperation searchOperation)
- throws DirectoryException, CancelledOperationException
- {
+ throws DirectoryException, CanceledOperationException {
DN baseDN = searchOperation.getBaseDN();
if (! baseDN.isNullDN())
{
@@ -1002,11 +1001,7 @@
for (DN subBase : baseMap.keySet())
{
- CancelRequest cancelRequest = searchOperation.getCancelRequest();
- if (cancelRequest != null)
- {
- throw new CancelledOperationException(CancelResult.CANCELED);
- }
+ searchOperation.checkIfCanceled(false);
Backend b = baseMap.get(subBase);
Entry subBaseEntry = b.getEntry(subBase);
@@ -1033,11 +1028,7 @@
{
for (DN subBase : baseMap.keySet())
{
- CancelRequest cancelRequest = searchOperation.getCancelRequest();
- if (cancelRequest != null)
- {
- throw new CancelledOperationException(CancelResult.CANCELED);
- }
+ searchOperation.checkIfCanceled(false);
Backend b = baseMap.get(subBase);
searchOperation.setBaseDN(subBase);
--
Gitblit v1.10.0