Make a few general changes to operation processing:

neil_a_wilson

27.28.2006 d1e5fe55252799742c6dc12265130edce17ff4be

 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;
      }