From 31aededecfc4ec2085c00f23e2a78f660995efaa Mon Sep 17 00:00:00 2001
From: Till Rohrmann <trohrmann@apache.org>
Date: Wed, 2 Sep 2015 09:42:38 +0200
Subject: [PATCH] [FLINK-2604] [runtime] Adds synchronization to stop method of
 ZooKeeperLeaderElectionService

---
 .../leaderelection/ZooKeeperLeaderElectionService.java      | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/leaderelection/ZooKeeperLeaderElectionService.java b/flink-runtime/src/main/java/org/apache/flink/runtime/leaderelection/ZooKeeperLeaderElectionService.java
index d1fd548f742..709d0319faa 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/leaderelection/ZooKeeperLeaderElectionService.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/leaderelection/ZooKeeperLeaderElectionService.java
@@ -114,8 +114,10 @@ public class ZooKeeperLeaderElectionService implements LeaderElectionService, Le
 		leaderLatch.close();
 		client.close();
 
-		confirmedLeaderSessionID = null;
-		issuedLeaderSessionID = null;
+		synchronized (lock) {
+			confirmedLeaderSessionID = null;
+			issuedLeaderSessionID = null;
+		}
 	}
 
 	@Override
-- 
GitLab