Merge branch '1.10_release_4.0.x' into 1.10_release_4.1.x

gituser · gituser · commit 483881136144 · 2021-04-23T10:07:29.000+08:00
diff --git a/elasticsearch5-xh/elasticsearch5-xh-sink/src/main/java/com/dtstack/flink/sql/sink/elasticsearch/table/ElasticsearchTableInfo.java b/elasticsearch5-xh/elasticsearch5-xh-sink/src/main/java/com/dtstack/flink/sql/sink/elasticsearch/table/ElasticsearchTableInfo.java
@@ -166,7 +166,7 @@ public boolean check() {
                         Strings.isNullOrEmpty(keytab) &&
                         Strings.isNullOrEmpty(krb5conf);
 
-        Preconditions.checkState(allNotSet, "xh's elasticsearch type of kerberos file is required");
+        Preconditions.checkState(!allNotSet, "xh's elasticsearch type of kerberos file is required");
 
         return true;
     }

Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,7 @@ public boolean check() {`
`166`	`166`	`Strings.isNullOrEmpty(keytab) &&`
`167`	`167`	`Strings.isNullOrEmpty(krb5conf);`
`168`	`168`
`169`		`- Preconditions.checkState(allNotSet, "xh's elasticsearch type of kerberos file is required");`
	`169`	`+ Preconditions.checkState(!allNotSet, "xh's elasticsearch type of kerberos file is required");`
`170`	`170`
`171`	`171`	`return true;`
`172`	`172`	`}`