From 600f6cb4356f2355a004604b9353505f0c2f7f49 Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Mon, 29 Sep 2014 10:04:51 +0000
Subject: [PATCH] OPENDJ-1536 OPENDJ-1285 Rename FutureResult classes hierarchy in the SDK to enhance code consistency
---
opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/LDAPCollectionResourceProvider.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/LDAPCollectionResourceProvider.java b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/LDAPCollectionResourceProvider.java
index 9f8d349..0a0521a 100644
--- a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/LDAPCollectionResourceProvider.java
+++ b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/LDAPCollectionResourceProvider.java
@@ -417,7 +417,7 @@
* order and may cause the JSON resources to be returned in a different order to the
* order in which the primary LDAP search results were received. This is benign at
* the moment, but will need resolving when we implement server side sorting. A
- * possible fix will be to use a queue of pending resources (futures?). However,
+ * possible fix will be to use a queue of pending resources (promises?). However,
* the queue cannot be unbounded in case it grows very large, but it cannot be
* bounded either since that could cause a deadlock between rest2ldap and the LDAP
* server (imagine the case where the server has a single worker thread which is
--
Gitblit v1.10.0