Shutdown ExecutorService in test

belugabehr · belugabehr · commit 38d7e3f05336 · 2019-10-10T14:57:07.000-04:00
diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/util/TestCircularBlockingQueue.java b/zookeeper-server/src/test/java/org/apache/zookeeper/util/TestCircularBlockingQueue.java
@@ -53,20 +53,24 @@ public void testCircularBlockingQueueTakeBlock()
     final CircularBlockingQueue<Integer> testQueue = new CircularBlockingQueue<>(2);
 
     ExecutorService executor = Executors.newSingleThreadExecutor();
-
-    Future<Integer> testTake = executor.submit(() -> {
-      return testQueue.take();
-    });
-
-    // Allow the other thread to get into position; waiting for item to be inserted
-    while (!testQueue.isConsumerThreadBlocked()) {
-      Thread.sleep(50L);
+    try {
+      Future<Integer> testTake = executor.submit(() -> {
+        return testQueue.take();
+      });
+
+      // Allow the other thread to get into position; waiting for item to be
+      // inserted
+      while (!testQueue.isConsumerThreadBlocked()) {
+        Thread.sleep(50L);
+      }
+
+      testQueue.offer(10);
+
+      Integer result = testTake.get();
+      Assert.assertEquals(10, result.intValue());
+    } finally {
+      executor.shutdown();
     }
-
-    testQueue.offer(10);
-
-    Integer result = testTake.get();
-    Assert.assertEquals(10, result.intValue());
   }
 
 }
