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 1B94E17C9B for ; Wed, 4 Mar 2015 17:25:17 +0000 (UTC) Received: (qmail 52254 invoked by uid 500); 4 Mar 2015 17:25:10 -0000 Delivered-To: apmail-usergrid-commits-archive@usergrid.apache.org Received: (qmail 52188 invoked by uid 500); 4 Mar 2015 17:25:10 -0000 Mailing-List: contact commits-help@usergrid.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@usergrid.incubator.apache.org Delivered-To: mailing list commits@usergrid.incubator.apache.org Received: (qmail 52136 invoked by uid 99); 4 Mar 2015 17:25:10 -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; Wed, 04 Mar 2015 17:25:10 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7E8FCE0F5A; Wed, 4 Mar 2015 17:25:10 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: toddnine@apache.org To: commits@usergrid.apache.org Date: Wed, 04 Mar 2015 17:25:14 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [05/14] incubator-usergrid git commit: change timeout change timeout Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/4d6bee0d Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/4d6bee0d Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/4d6bee0d Branch: refs/heads/two-dot-o Commit: 4d6bee0d88c3335c8fef95f3da0fcdbfdfaca08a Parents: f0b11c6 Author: Shawn Feldman Authored: Mon Mar 2 12:14:51 2015 -0700 Committer: Shawn Feldman Committed: Mon Mar 2 12:14:51 2015 -0700 ---------------------------------------------------------------------- .../persistence/cassandra/EntityManagerFactoryImplIT.java | 10 +++++++++- .../org/apache/usergrid/persistence/index/IndexFig.java | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4d6bee0d/stack/core/src/test/java/org/apache/usergrid/persistence/cassandra/EntityManagerFactoryImplIT.java ---------------------------------------------------------------------- diff --git a/stack/core/src/test/java/org/apache/usergrid/persistence/cassandra/EntityManagerFactoryImplIT.java b/stack/core/src/test/java/org/apache/usergrid/persistence/cassandra/EntityManagerFactoryImplIT.java index 20bf7eb..3f42356 100644 --- a/stack/core/src/test/java/org/apache/usergrid/persistence/cassandra/EntityManagerFactoryImplIT.java +++ b/stack/core/src/test/java/org/apache/usergrid/persistence/cassandra/EntityManagerFactoryImplIT.java @@ -189,7 +189,15 @@ public class EntityManagerFactoryImplIT extends AbstractCoreIT { } assertFalse("Restored app found in deleted apps collection", found); - found = func0.call(); + found = false; + appMap = setup.getEmf().getApplications(); + for ( String appName : appMap.keySet() ) { + UUID appId = appMap.get( appName ); + if ( appId.equals( applicationId )) { + found = true; + break; + } + } assertTrue("Restored app not found in apps collection", found); // TODO: this assertion should work! http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4d6bee0d/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/IndexFig.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/IndexFig.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/IndexFig.java index 8040a62..9893ca5 100644 --- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/IndexFig.java +++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/IndexFig.java @@ -51,7 +51,7 @@ public interface IndexFig extends GuicyFig { public static final String INDEX_BUFFER_SIZE = "elasticsearch.buffer_size"; - public static final String INDEX_BUFFER_TIMEOUT = "elasticsearch.buffer_size"; + public static final String INDEX_BUFFER_TIMEOUT = "elasticsearch.buffer_timeout"; public static final String INDEX_BATCH_SIZE = "elasticsearch.batch_size";