You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sf...@apache.org on 2014/12/22 16:36:26 UTC
[27/50] incubator-usergrid git commit: Fix merge problem.
Fix merge problem.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/8457acf2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/8457acf2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/8457acf2
Branch: refs/heads/UG-rest-test-framework-overhaul
Commit: 8457acf2876bdde431f8042e7928a8be94e3a38c
Parents: bce8142
Author: Dave Johnson <dm...@apigee.com>
Authored: Fri Nov 7 10:16:53 2014 -0500
Committer: Dave Johnson <dm...@apigee.com>
Committed: Fri Nov 7 10:16:53 2014 -0500
----------------------------------------------------------------------
.../persistence/index/impl/EsEntityIndexBatchImpl.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/8457acf2/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 a0344e0..b1e3b33 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
@@ -258,9 +258,9 @@ public class EsEntityIndexBatchImpl implements EntityIndexBatch {
try {
responses = request.execute().actionGet();
- }catch(Throwable t){
- log.error( "Unable to communicate with elasticsearch" );
- failureMonitor.fail( "Unable to execute batch", t );
+ } catch (Throwable t) {
+ logger.error("Unable to communicate with elasticsearch");
+ failureMonitor.fail("Unable to execute batch", t);
throw t;
}