From f387848f83876dd8b3312b3be9c70bf3cb06452e Mon Sep 17 00:00:00 2001
From: Boaz Leskes <b.leskes@gmail.com>
Date: Tue, 10 Jan 2017 13:59:28 +0100
Subject: [PATCH] MockTransportService.doClose assertions should check
 openConnections under lock

---
 .../elasticsearch/test/transport/MockTransportService.java   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/test/framework/src/main/java/org/elasticsearch/test/transport/MockTransportService.java b/test/framework/src/main/java/org/elasticsearch/test/transport/MockTransportService.java
index b0cc848da61..bc8bd946240 100644
--- a/test/framework/src/main/java/org/elasticsearch/test/transport/MockTransportService.java
+++ b/test/framework/src/main/java/org/elasticsearch/test/transport/MockTransportService.java
@@ -64,7 +64,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Queue;
 import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.LinkedBlockingDeque;
@@ -743,6 +742,8 @@ public final class MockTransportService extends TransportService {
     @Override
     protected void doClose() {
         super.doClose();
-        assert openConnections.size() == 0 : "still open connections: " + openConnections;
+        synchronized (openConnections) {
+            assert openConnections.size() == 0 : "still open connections: " + openConnections;
+        }
     }
 }