You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by to...@apache.org on 2015/03/12 00:09:50 UTC
incubator-usergrid git commit: Changes the batch future set.
Repository: incubator-usergrid
Updated Branches:
refs/heads/USERGRID-466 77542c6b1 -> d81dfaa14
Changes the batch future set.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/d81dfaa1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/d81dfaa1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/d81dfaa1
Branch: refs/heads/USERGRID-466
Commit: d81dfaa14f11c524e3f114b0b030bc447ee8100b
Parents: 77542c6
Author: Todd Nine <tn...@apigee.com>
Authored: Wed Mar 11 17:09:48 2015 -0600
Committer: Todd Nine <tn...@apigee.com>
Committed: Wed Mar 11 17:09:48 2015 -0600
----------------------------------------------------------------------
.../usergrid/persistence/index/impl/EsEntityIndexBatchImpl.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/d81dfaa1/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexBatchImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexBatchImpl.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexBatchImpl.java
index 8481dab..16b3ff9 100644
--- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexBatchImpl.java
+++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexBatchImpl.java
@@ -197,9 +197,8 @@ public class EsEntityIndexBatchImpl implements EntityIndexBatch {
* No-op, just disregard it
*/
if(tempContainer.isEmpty()){
- final BetterFuture<?> future = tempContainer.getFuture();
- future.done();
- return future;
+ tempContainer.done();
+ return tempContainer.getFuture();
}
return indexBatchBufferProducer.put(tempContainer);