Refactoring and fixes

Author: Tilmann Zäschke

src/main/java/org/scion/multiping/PingAll.java

@@ -24,6 +24,7 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 import org.scion.jpan.*;
 import org.scion.jpan.internal.PathRawParser;
@@ -308,6 +309,7 @@ private Scmp.TracerouteMessage findFastestTR(List<Path> paths, Ref<Path> refBest
   private Scmp.TracerouteMessage findFastestTRasync(List<Path> paths, Ref<Path> refBest) {
     ConcurrentHashMap<Integer, Scmp.TimedMessage> messages = new ConcurrentHashMap<>();
     CountDownLatch barrier = new CountDownLatch(paths.size());
+    AtomicInteger errors = new AtomicInteger();
     ScmpSenderAsync.ResponseHandler handler =
         new ScmpSenderAsync.ResponseHandler() {
           @Override
@@ -324,13 +326,13 @@ public void onTimeout(Scmp.TimedMessage msg) {
 
           @Override
           public void onError(Scmp.ErrorMessage msg) {
-            summary.incAsError();
+            errors.incrementAndGet();
             barrier.countDown();
           }
 
           @Override
           public void onException(Throwable t) {
-            summary.incAsError();
+            errors.incrementAndGet();
             barrier.countDown();
           }
         };
@@ -356,6 +358,11 @@ public void onException(Throwable t) {
       throw new IllegalStateException(e);
     }
 
+    if (errors.get() > 0 && messages.isEmpty()) {
+      summary.incAsError();
+      return null;
+    }
+
     Scmp.TracerouteMessage best = null;
     for (Scmp.TimedMessage tm : messages.values()) {
       Scmp.TracerouteMessage msg = (Scmp.TracerouteMessage) tm;

src/test/java/org/scion/multiping/PingAllTest.java

@@ -161,12 +161,11 @@ class MyWithHandler extends WithHandler {
     PingAll ping = new PingAll(PingAll.Policy.FASTEST_TR_ASYNC, p);
     ResultSummary summary = ping.run();
     assertEquals(0, summary.getMaxPaths().getPathCount());
-    assertEquals(9, summary.getAsErrors());
+    assertEquals(3, summary.getAsErrors());
   }
 
   @Test
   void testPingSendingError() throws IOException {
-    List<Path> paths = PathHelper.createPaths(3);
     class MyWithHandler extends WithIOError {
       MyWithHandler(ScmpSenderAsync.ResponseHandler handler) {
         super(handler, hdl -> {});