Merge Bo's most recent changes.

matthew_swift

04.12.2009 fa59221ed4c2777097b0fd1a38c6839d60680499

 opendj-sdk/sdk/src/org/opends/sdk/ldap/AbstractResultFutureImpl.java

@@ -38,6 +38,7 @@
import org.opends.sdk.ResultHandler;
import org.opends.sdk.requests.Requests;
import org.opends.sdk.responses.Result;
import org.opends.sdk.responses.Responses;
import org.opends.sdk.util.StaticUtils;


@@ -241,11 +242,12 @@



  private R get0() throws CancellationException, ErrorResultException
  private R get0() throws ErrorResultException
  {
    if (isCancelled())
    {
      throw new CancellationException();
      throw ErrorResultException.wrap(
          Responses.newResult(ResultCode.CLIENT_SIDE_USER_CANCELLED));
    }
    else if (result.getResultCode().isExceptional())
    {