Return-Path: X-Original-To: apmail-usergrid-commits-archive@minotaur.apache.org Delivered-To: apmail-usergrid-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5967B17DE7 for ; Thu, 1 Oct 2015 16:27:47 +0000 (UTC) Received: (qmail 62777 invoked by uid 500); 1 Oct 2015 16:27:37 -0000 Delivered-To: apmail-usergrid-commits-archive@usergrid.apache.org Received: (qmail 62718 invoked by uid 500); 1 Oct 2015 16:27:37 -0000 Mailing-List: contact commits-help@usergrid.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@usergrid.apache.org Delivered-To: mailing list commits@usergrid.apache.org Received: (qmail 62119 invoked by uid 99); 1 Oct 2015 16:27:37 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Oct 2015 16:27:37 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 12464E1551; Thu, 1 Oct 2015 16:27:37 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sfeldman@apache.org To: commits@usergrid.apache.org Date: Thu, 01 Oct 2015 16:27:52 -0000 Message-Id: <5b3d5e5f4009436ebdce83c6066e3789@git.apache.org> In-Reply-To: <74f2f74819104da085f5c494de06c327@git.apache.org> References: <74f2f74819104da085f5c494de06c327@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [17/36] usergrid git commit: remove rx remove rx Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/28919aeb Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/28919aeb Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/28919aeb Branch: refs/heads/master Commit: 28919aebea35c027a5b720ebeebb2200c1d214c3 Parents: bdea1ff Author: Shawn Feldman Authored: Fri Sep 25 13:47:29 2015 -0600 Committer: Shawn Feldman Committed: Fri Sep 25 13:47:29 2015 -0600 ---------------------------------------------------------------------- .../usergrid/persistence/index/impl/EsIndexProducerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/28919aeb/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsIndexProducerImpl.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsIndexProducerImpl.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsIndexProducerImpl.java index a2c8663..2b36fc8 100644 --- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsIndexProducerImpl.java +++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsIndexProducerImpl.java @@ -132,7 +132,7 @@ public class EsIndexProducerImpl implements IndexProducer { //now that we've processed them all, ack the futures after our last batch comes through final Observable processedIndexOperations = - requests.lastOrDefault(null).flatMap(lastRequest -> { + requests.flatMap(lastRequest -> { if (lastRequest != null) { return Observable.just(batch); } else {