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/ExtendedOperation.java |   66 ++++++++-------------------------
 1 files changed, 16 insertions(+), 50 deletions(-)

diff --git a/opends/src/server/org/opends/server/core/ExtendedOperation.java b/opends/src/server/org/opends/server/core/ExtendedOperation.java
index 8e76852..9084c17 100644
--- a/opends/src/server/org/opends/server/core/ExtendedOperation.java
+++ b/opends/src/server/org/opends/server/core/ExtendedOperation.java
@@ -47,6 +47,7 @@
 import static org.opends.server.loggers.Debug.*;
 import static org.opends.server.messages.CoreMessages.*;
 import static org.opends.server.messages.MessageHandler.*;
+import static org.opends.server.util.ServerConstants.*;
 
 
 
@@ -458,24 +459,13 @@
     // Check for and handle a request to cancel this operation.
     if (cancelRequest != null)
     {
-      setCancelResult(CancelResult.CANCELED);
-
-      if (cancelRequest.notifyOriginalRequestor() ||
-          DirectoryServer.notifyAbandonedOperations())
+      if (! (requestOID.equals(OID_CANCEL_REQUEST) ||
+             requestOID.equals(OID_START_TLS_REQUEST)))
       {
-        setResultCode(ResultCode.CANCELED);
-
-        String cancelReason = cancelRequest.getCancelReason();
-        if (cancelReason != null)
-        {
-          appendErrorMessage(cancelReason);
-        }
-
-        clientConnection.sendResponse(this);
+        indicateCancelled(cancelRequest);
+        processingStopTime = System.currentTimeMillis();
+        return;
       }
-
-      processingStopTime = System.currentTimeMillis();
-      return;
     }
 
 
@@ -516,25 +506,13 @@
       // Check for and handle a request to cancel this operation.
       if (cancelRequest != null)
       {
-        setCancelResult(CancelResult.CANCELED);
-
-        if (cancelRequest.notifyOriginalRequestor() ||
-            DirectoryServer.notifyAbandonedOperations())
+        if (! (requestOID.equals(OID_CANCEL_REQUEST) ||
+               requestOID.equals(OID_START_TLS_REQUEST)))
         {
-          setResultCode(ResultCode.CANCELED);
-
-          String cancelReason = cancelRequest.getCancelReason();
-          if (cancelReason != null)
-          {
-            appendErrorMessage(cancelReason);
-          }
-
-          clientConnection.sendResponse(this);
+          indicateCancelled(cancelRequest);
+          processingStopTime = System.currentTimeMillis();
+          return;
         }
-
-        processingStopTime = System.currentTimeMillis();
-        logExtendedResponse(this);
-        return;
       }
 
 
@@ -601,25 +579,13 @@
       // Check for and handle a request to cancel this operation.
       if (cancelRequest != null)
       {
-        setCancelResult(CancelResult.CANCELED);
-
-        if (cancelRequest.notifyOriginalRequestor() ||
-            DirectoryServer.notifyAbandonedOperations())
+        if (! (requestOID.equals(OID_CANCEL_REQUEST) ||
+               requestOID.equals(OID_START_TLS_REQUEST)))
         {
-          setResultCode(ResultCode.CANCELED);
-
-          String cancelReason = cancelRequest.getCancelReason();
-          if (cancelReason != null)
-          {
-            appendErrorMessage(cancelReason);
-          }
-
-          clientConnection.sendResponse(this);
+          indicateCancelled(cancelRequest);
+          processingStopTime = System.currentTimeMillis();
+          return;
         }
-
-        processingStopTime = System.currentTimeMillis();
-        logExtendedResponse(this);
-        return;
       }
 
 

--
Gitblit v1.10.0