fix merge comflict bug

DTStack · May 12, 2020 · 0e21db6 · 0e21db6
1 parent d80f371
commit 0e21db6
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/...de/src/main/java/com/dtstack/flink/sql/side/elasticsearch6/Elasticsearch6AsyncReqRow.java b/...de/src/main/java/com/dtstack/flink/sql/side/elasticsearch6/Elasticsearch6AsyncReqRow.java
@@ -128,7 +128,7 @@ public void onResponse(SearchResponse searchResponse) {
                         dealCacheData(key, CacheObj.buildCacheObj(ECacheContentType.MultiLine, cacheContent));
                         resultFuture.complete(rowList);
                     } catch (Exception e) {
-                        dealFillDataError(resultFuture, e, input);
+                        dealFillDataError(input, resultFuture, e);
                     } finally {
                         if (tmpRhlClient != null) {
                             try {