Merge branch '5.4.x' into 5.5.x

kafka-group · Jul 21, 2020 · 6e9b857 · 6e9b857
2 parents f6772d3 + 9c2e8dc
commit 6e9b857
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
@@ -249,6 +249,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);