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/AddOperation.java | 102 +++------------------------------------------------
1 files changed, 6 insertions(+), 96 deletions(-)
diff --git a/opends/src/server/org/opends/server/core/AddOperation.java b/opends/src/server/org/opends/server/core/AddOperation.java
index c5d8808..f9cd074 100644
--- a/opends/src/server/org/opends/server/core/AddOperation.java
+++ b/opends/src/server/org/opends/server/core/AddOperation.java
@@ -695,22 +695,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;
}
@@ -759,22 +744,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();
logAddResponse(this);
return;
@@ -909,22 +879,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();
logAddResponse(this);
return;
@@ -993,22 +948,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();
logAddResponse(this);
return;
@@ -1770,22 +1710,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();
logAddResponse(this);
return;
@@ -1823,22 +1748,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();
logAddResponse(this);
return;
--
Gitblit v1.10.0