Update the LDAP connection handler and LDAP client connection to properly u...

neil_a_wilson

18.01.2006 275e21eb2b5b06d291a44f3a485cf62bc927fc52

 opends/src/server/org/opends/server/protocols/ldap/LDAPClientConnection.java

@@ -1312,7 +1312,15 @@
      {
        if (ps.getSearchOperation().getMessageID() == messageID)
        {
          return ps.getSearchOperation().cancel(cancelRequest);
          CancelResult cancelResult =
               ps.getSearchOperation().cancel(cancelRequest);

          if (keepStats && (cancelResult == CancelResult.CANCELED))
          {
            statTracker.updateAbandonedOperation();
          }

          return cancelResult;
        }
      }

@@ -1320,6 +1328,12 @@
    }
    else
    {
      CancelResult cancelResult = op.cancel(cancelRequest);
      if (keepStats && (cancelResult == CancelResult.CANCELED))
      {
        statTracker.updateAbandonedOperation();
      }

      return op.cancel(cancelRequest);
    }
  }
@@ -1347,7 +1361,11 @@
      {
        try
        {
          o.cancel(cancelRequest);
          CancelResult cancelResult = o.cancel(cancelRequest);
          if (keepStats && (cancelResult == CancelResult.CANCELED))
          {
            statTracker.updateAbandonedOperation();
          }
        }
        catch (Exception e)
        {
@@ -1408,7 +1426,11 @@
        {
          try
          {
            o.cancel(cancelRequest);
            CancelResult cancelResult = o.cancel(cancelRequest);
            if (keepStats && (cancelResult == CancelResult.CANCELED))
            {
              statTracker.updateAbandonedOperation();
            }
          }
          catch (Exception e)
          {
@@ -1848,6 +1870,10 @@
                              protocolOp.getIDToAbandon());

    abandonOp.run();
    if (keepStats && (abandonOp.getResultCode() == ResultCode.CANCELED))
    {
      statTracker.updateAbandonedOperation();
    }

    return connectionValid;
  }