commit 35708a94b7fcc2beb5addad49f9f3a3185fb08a3
author Madan Jampani <madan@onlab.us> Wed Jul 06 10:48:19 2016 -0700
committer Gerrit Code Review <gerrit@onlab.us> Tue Jul 12 02:00:47 2016 +0000
tree 61bb97620c653df11c812e94eeab058436c65e34
parent 54c5e238e67abb66683430a04b8394db388dc837

Distributed work queue primitive

Change-Id: Ia8e531e6611ec502399edec376ccc00522e47994

core/store/primitives/src/test/java/org/onosproject/store/primitives/resources/impl/AtomixTestBase.java

diff --git a/core/store/primitives/src/test/java/org/onosproject/store/primitives/resources/impl/AtomixTestBase.java b/core/store/primitives/src/test/java/org/onosproject/store/primitives/resources/impl/AtomixTestBase.java
index 7dfe82f..f7a5007 100644
--- a/core/store/primitives/src/test/java/org/onosproject/store/primitives/resources/impl/AtomixTestBase.java
+++ b/core/store/primitives/src/test/java/org/onosproject/store/primitives/resources/impl/AtomixTestBase.java
@@ -16,6 +16,7 @@
 package org.onosproject.store.primitives.resources.impl;
 
 import com.google.common.util.concurrent.Uninterruptibles;
+
 import io.atomix.AtomixClient;
 import io.atomix.catalyst.serializer.Serializer;
 import io.atomix.catalyst.transport.Address;
@@ -114,18 +115,18 @@
 
         CompletableFuture<Void> closeClients =
                 CompletableFuture.allOf(atomixClients.stream()
-                                         .map(AtomixClient::close)
-                                         .toArray(CompletableFuture[]::new));
+                                                     .map(AtomixClient::close)
+                                                     .toArray(CompletableFuture[]::new));
+        closeClients.join();
 
-        closeClients
-                .thenCompose(v -> CompletableFuture
-                        .allOf(copycatServers.stream()
-                .map(CopycatServer::shutdown)
-                .toArray(CompletableFuture[]::new))).join();
+        CompletableFuture<Void> closeServers =
+                CompletableFuture.allOf(copycatServers.stream()
+                                                      .map(CopycatServer::shutdown)
+                                                      .toArray(CompletableFuture[]::new));
+        closeServers.join();
 
-        atomixClients = new ArrayList<>();
-
-        copycatServers = new ArrayList<>();
+        atomixClients.clear();
+        copycatServers.clear();
     }