Github user vrozov commented on a diff in the pull request: https://github.com/apache/drill/pull/1145#discussion_r172642452 --- Diff: exec/java-exec/src/main/java/org/apache/drill/exec/client/DrillClient.java --- @@ -371,17 +376,20 @@ protected void afterExecute(final Runnable r, final Throwable t) { while (triedEndpointIndex < connectTriesVal) { endpoint = endpoints.get(triedEndpointIndex); + + // Set in both props and properties since props is passed to UserClient + if (!properties.containsKey(DrillProperties.SERVICE_HOST)) { --- End diff -- Use `putIfAbsent()` instead of `containsKey()` (avoid double get()).
---