This is an automated email from the ASF dual-hosted git repository. jmark99 pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/accumulo.git
The following commit(s) were added to refs/heads/main by this push: new 66ef783 Utilize Uninterruptibles.joinUninterruptibly in ServiceLockIT (#2476) 66ef783 is described below commit 66ef78338927d61c2624f10b377e3928527665e8 Author: Mark Owens <jmar...@apache.org> AuthorDate: Thu Feb 10 08:52:45 2022 -0500 Utilize Uninterruptibles.joinUninterruptibly in ServiceLockIT (#2476) Replace t.join within the try/catch of ServiceLockIT with the use of Uninterruptibles.joinUninterruptibly. --- .../org/apache/accumulo/test/fate/zookeeper/ServiceLockIT.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/test/src/main/java/org/apache/accumulo/test/fate/zookeeper/ServiceLockIT.java b/test/src/main/java/org/apache/accumulo/test/fate/zookeeper/ServiceLockIT.java index f6c5238..5a0a569 100644 --- a/test/src/main/java/org/apache/accumulo/test/fate/zookeeper/ServiceLockIT.java +++ b/test/src/main/java/org/apache/accumulo/test/fate/zookeeper/ServiceLockIT.java @@ -59,6 +59,8 @@ import org.junit.experimental.categories.Category; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.google.common.util.concurrent.Uninterruptibles; + @Category({ZooKeeperTestingServerTests.class}) public class ServiceLockIT { @@ -622,13 +624,7 @@ public class ServiceLockIT { workers.forEach(w -> assertNull(w.getException())); assertEquals(0, zk.getChildren(parent.toString(), false).size()); - threads.forEach(t -> { - try { - t.join(); - } catch (InterruptedException e) { - // ignore - } - }); + threads.forEach(Uninterruptibles::joinUninterruptibly); } }