You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streams.apache.org by sb...@apache.org on 2014/05/13 17:23:03 UTC

[13/14] git commit: line missing from merge

line missing from merge


Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/237f2a6a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/237f2a6a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/237f2a6a

Branch: refs/heads/master
Commit: 237f2a6ab13c68a61cf715004fe7b85db66237f6
Parents: 64cd122
Author: sblackmon <sb...@w2odigital.com>
Authored: Fri May 9 15:44:42 2014 -0500
Committer: sblackmon <sb...@w2odigital.com>
Committed: Fri May 9 15:44:42 2014 -0500

----------------------------------------------------------------------
 .../apache/streams/elasticsearch/ElasticsearchPersistWriter.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/237f2a6a/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/ElasticsearchPersistWriter.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/ElasticsearchPersistWriter.java b/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/ElasticsearchPersistWriter.java
index 97796e2..271521c 100644
--- a/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/ElasticsearchPersistWriter.java
+++ b/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/ElasticsearchPersistWriter.java
@@ -418,8 +418,10 @@ public class ElasticsearchPersistWriter implements StreamsPersistWriter, Flushab
 
         // If our queue is larger than our flush threashold, then we should flush the queue.
         if( (batchSizeInBytes > flushThresholdSizeInBytes) ||
-                (currentItems >= batchSize) )
+                (currentItems >= batchSize) ) {
             flushInternal();
+            this.currentItems = 0;
+        }
     }
 
     private void checkIndexImplications(String indexName)