From 8639b45fe9a99486a29df1adff56f71dbdd64dde Mon Sep 17 00:00:00 2001
From: rewerma <rewerma@163.com>
Date: Fri, 12 Jul 2019 09:52:36 +0800
Subject: [PATCH]  fix #1761 (#1973)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Message转Dml对null值的判断

* Message转Dml对null值的判断

* Message转Dml对null值的判断

* fix #1761
---
 .../otter/canal/client/adapter/es/support/ESTemplate.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client-adapter/elasticsearch/src/main/java/com/alibaba/otter/canal/client/adapter/es/support/ESTemplate.java b/client-adapter/elasticsearch/src/main/java/com/alibaba/otter/canal/client/adapter/es/support/ESTemplate.java
index 1eab3726..1aaa14c9 100644
--- a/client-adapter/elasticsearch/src/main/java/com/alibaba/otter/canal/client/adapter/es/support/ESTemplate.java
+++ b/client-adapter/elasticsearch/src/main/java/com/alibaba/otter/canal/client/adapter/es/support/ESTemplate.java
@@ -210,16 +210,16 @@ public class ESTemplate {
                     }
                 }
             }
+            resetBulkRequestBuilder();
         }
     }
 
     /**
-     * 如果大于批量数则提交批次, 调用后es bulk请求后，numberOfActions不会清理，需要主动调用函数清0，否则不能起到批量请求的效果
+     * 如果大于批量数则提交批次
      */
     private void commitBulk() {
         if (getBulk().numberOfActions() >= MAX_BATCH_SIZE) {
             commit();
-            resetBulkRequestBuilder();
         }
     }