From 388f25a9dc58704ea19a333ba9a28054d48590b1 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Tue, 15 Dec 2009 21:58:47 +0000
Subject: [PATCH] Various changes:
---
sdk/src/org/opends/sdk/FutureResult.java | 20 ++++++--------------
1 files changed, 6 insertions(+), 14 deletions(-)
diff --git a/sdk/src/org/opends/sdk/ResultFuture.java b/sdk/src/org/opends/sdk/FutureResult.java
similarity index 87%
rename from sdk/src/org/opends/sdk/ResultFuture.java
rename to sdk/src/org/opends/sdk/FutureResult.java
index e3a933f..3b9ff34 100644
--- a/sdk/src/org/opends/sdk/ResultFuture.java
+++ b/sdk/src/org/opends/sdk/FutureResult.java
@@ -29,7 +29,6 @@
-import java.util.concurrent.CancellationException;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
@@ -43,7 +42,7 @@
* @param <S>
* The type of result returned by this future.
*/
-public interface ResultFuture<S> extends Future<S>
+public interface FutureResult<S> extends Future<S>
{
/**
* Attempts to cancel the request. This attempt will fail if the
@@ -79,14 +78,10 @@
* @throws ErrorResultException
* If the result code indicates that the request failed for
* some reason.
- * @throws CancellationException
- * If the request was cancelled using a call to
- * {@link #cancel}.
* @throws InterruptedException
* If the current thread was interrupted while waiting.
*/
- S get() throws ErrorResultException, CancellationException,
- InterruptedException;
+ S get() throws ErrorResultException, InterruptedException;
@@ -107,23 +102,20 @@
* some reason.
* @throws TimeoutException
* If the wait timed out.
- * @throws CancellationException
- * If the request was cancelled using a call to
- * {@link #cancel}.
* @throws InterruptedException
* If the current thread was interrupted while waiting.
*/
S get(long timeout, TimeUnit unit) throws ErrorResultException,
- TimeoutException, CancellationException, InterruptedException;
+ TimeoutException, InterruptedException;
/**
- * Returns the message ID of the request.
+ * Returns the request ID of the request if appropriate.
*
- * @return The message ID.
+ * @return The request ID, or {@code -1} if there is no request ID.
*/
- int getMessageID();
+ int getRequestID();
--
Gitblit v1.10.0