Merge branch 'cassandra-3.0' into cassandra-3.11

2021-06-08 11:04:20 -04:00 · 2021-06-08 11:04:20 -04:00 · 27f4cb68f2
parent dc8ccb7fb9 a9f472c432
commit 27f4cb68f2
1 changed files with 1 additions and 1 deletions
--- a/test/unit/org/apache/cassandra/utils/memory/NativeAllocatorTest.java
+++ b/test/unit/org/apache/cassandra/utils/memory/NativeAllocatorTest.java
@ -122,7 +122,7 @@ public class NativeAllocatorTest
            canClean.countDown();
            try
            {
-                isClean.await(10L, TimeUnit.MILLISECONDS);
+                Assert.assertTrue(isClean.await(10L, TimeUnit.SECONDS));
            }
            catch (InterruptedException e)
            {