usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject [24/50] incubator-usergrid git commit: Fix merge problem.
Date Tue, 16 Dec 2014 14:59:54 GMT
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/no-source-in-es
Commit: 8457acf2876bdde431f8042e7928a8be94e3a38c
Parents: bce8142
Author: Dave Johnson <dmjohnson@apigee.com>
Authored: Fri Nov 7 10:16:53 2014 -0500
Committer: Dave Johnson <dmjohnson@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;
         }
 


Mime
View raw message