From 20df27fbd253139d3e5a24dd6e8063ed11dd1fab Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Fri, 04 Dec 2009 11:12:28 +0000
Subject: [PATCH] Merge Bo's most recent changes.
---
sdk/src/org/opends/sdk/ldap/AbstractResultFutureImpl.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/sdk/src/org/opends/sdk/ldap/AbstractResultFutureImpl.java b/sdk/src/org/opends/sdk/ldap/AbstractResultFutureImpl.java
index 6bd5050..3111494 100644
--- a/sdk/src/org/opends/sdk/ldap/AbstractResultFutureImpl.java
+++ b/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())
{
--
Gitblit v1.10.0