Merge branch '5.1.x' into 5.2.x

kafka-group · Jul 21, 2020 · 202d18d · 202d18d
2 parents 0ee062c + d7bc835
commit 202d18d
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/src/main/java/io/confluent/connect/elasticsearch/jest/JestElasticsearchClient.java b/src/main/java/io/confluent/connect/elasticsearch/jest/JestElasticsearchClient.java
@@ -223,6 +223,11 @@ private Version getServerVersion() throws IOException {
       LOG.warn("Couldn't get Elasticsearch version (result is null); assuming {}", defaultVersion);
       return defaultVersion;
     }
+    if (!result.has("nodes")) {
+      LOG.warn("Couldn't get Elasticsearch version from result {} (result has no nodes). "
+          + "Assuming {}.", result, defaultVersion);
+      return defaultVersion;
+    }
 
     checkForError(result);