From d1e5fe55252799742c6dc12265130edce17ff4be Mon Sep 17 00:00:00 2001
From: neil_a_wilson <neil_a_wilson@localhost>
Date: Wed, 27 Sep 2006 20:28:10 +0000
Subject: [PATCH] Make a few general changes to operation processing:
---
opends/src/server/org/opends/server/core/SearchOperation.java | 85 ++----------------------------------------
1 files changed, 5 insertions(+), 80 deletions(-)
diff --git a/opends/src/server/org/opends/server/core/SearchOperation.java b/opends/src/server/org/opends/server/core/SearchOperation.java
index 3005ceb..5e8657f 100644
--- a/opends/src/server/org/opends/server/core/SearchOperation.java
+++ b/opends/src/server/org/opends/server/core/SearchOperation.java
@@ -1537,22 +1537,7 @@
// Check for and handle a request to cancel this operation.
if (cancelRequest != null)
{
- setCancelResult(CancelResult.CANCELED);
-
- if (cancelRequest.notifyOriginalRequestor() ||
- DirectoryServer.notifyAbandonedOperations())
- {
- setResultCode(ResultCode.CANCELED);
-
- String cancelReason = cancelRequest.getCancelReason();
- if (cancelReason != null)
- {
- appendErrorMessage(cancelReason);
- }
-
- clientConnection.sendResponse(this);
- }
-
+ indicateCancelled(cancelRequest);
processingStopTime = System.currentTimeMillis();
return;
}
@@ -1594,22 +1579,7 @@
// Check for and handle a request to cancel this operation.
if (cancelRequest != null)
{
- setCancelResult(CancelResult.CANCELED);
-
- if (cancelRequest.notifyOriginalRequestor() ||
- DirectoryServer.notifyAbandonedOperations())
- {
- setResultCode(ResultCode.CANCELED);
-
- String cancelReason = cancelRequest.getCancelReason();
- if (cancelReason != null)
- {
- appendErrorMessage(cancelReason);
- }
-
- clientConnection.sendResponse(this);
- }
-
+ indicateCancelled(cancelRequest);
processingStopTime = System.currentTimeMillis();
logSearchResultDone(this);
return;
@@ -1929,22 +1899,7 @@
// Check for and handle a request to cancel this operation.
if (cancelRequest != null)
{
- setCancelResult(CancelResult.CANCELED);
-
- if (cancelRequest.notifyOriginalRequestor() ||
- DirectoryServer.notifyAbandonedOperations())
- {
- setResultCode(ResultCode.CANCELED);
-
- String cancelReason = cancelRequest.getCancelReason();
- if (cancelReason != null)
- {
- appendErrorMessage(cancelReason);
- }
-
- clientConnection.sendResponse(this);
- }
-
+ indicateCancelled(cancelRequest);
processingStopTime = System.currentTimeMillis();
logSearchResultDone(this);
return;
@@ -1977,22 +1932,7 @@
// Check for and handle a request to cancel this operation.
if (cancelRequest != null)
{
- setCancelResult(CancelResult.CANCELED);
-
- if (cancelRequest.notifyOriginalRequestor() ||
- DirectoryServer.notifyAbandonedOperations())
- {
- setResultCode(ResultCode.CANCELED);
-
- String cancelReason = cancelRequest.getCancelReason();
- if (cancelReason != null)
- {
- appendErrorMessage(cancelReason);
- }
-
- clientConnection.sendResponse(this);
- }
-
+ indicateCancelled(cancelRequest);
processingStopTime = System.currentTimeMillis();
logSearchResultDone(this);
return;
@@ -2097,22 +2037,7 @@
// Check for and handle a request to cancel this operation.
if (cancelRequest != null)
{
- setCancelResult(CancelResult.CANCELED);
-
- if (cancelRequest.notifyOriginalRequestor() ||
- DirectoryServer.notifyAbandonedOperations())
- {
- setResultCode(ResultCode.CANCELED);
-
- String cancelReason = cancelRequest.getCancelReason();
- if (cancelReason != null)
- {
- appendErrorMessage(cancelReason);
- }
-
- clientConnection.sendResponse(this);
- }
-
+ indicateCancelled(cancelRequest);
processingStopTime = System.currentTimeMillis();
logSearchResultDone(this);
return;
--
Gitblit v1.10.0