Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@
* @author Valentina Armenise
* @author Anders Swanson
* @author Omer Celik
* @author Choi Wang Gyu
*
* @since 1.3
*/
Expand Down Expand Up @@ -300,7 +301,7 @@ public final boolean initialize() {
private void updateClusterId(Admin adminClient) throws InterruptedException, ExecutionException, TimeoutException {
try {
this.clusterIdLock.lock();
if (this.clusterId != null) {
if (this.clusterId == null) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The original change is this: c84d0f7.
According to its logic this indeed has to be == null.
So, i treat this as a simple omission and schedule for back-port.
Thank you for spotting and fixing!

this.clusterId = adminClient.describeCluster().clusterId().get(this.operationTimeout,
TimeUnit.SECONDS);
}
Expand Down