Skip to content

Commit 0e21db6

Browse files
author
dapeng
committed
fix merge comflict bug
1 parent d80f371 commit 0e21db6

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

elasticsearch6/elasticsearch6-side/elasticsearch6-async-side/src/main/java/com/dtstack/flink/sql/side/elasticsearch6/Elasticsearch6AsyncReqRow.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ public void onResponse(SearchResponse searchResponse) {
128128
dealCacheData(key, CacheObj.buildCacheObj(ECacheContentType.MultiLine, cacheContent));
129129
resultFuture.complete(rowList);
130130
} catch (Exception e) {
131-
dealFillDataError(resultFuture, e, input);
131+
dealFillDataError(input, resultFuture, e);
132132
} finally {
133133
if (tmpRhlClient != null) {
134134
try {

0 commit comments

Comments
 (0)