Simplified code and refactored method to check also current Throwable

and also causes

1 files changed, 4 insertions, 10 deletions

diff --git a/src/main/java/com/it_jaros/jns/scan/Scanner.java b/src/main/java/com/it_jaros/jns/scan/Scanner.java
index 9e84c80..c388ef3 100644
--- a/src/main/java/com/it_jaros/jns/scan/Scanner.java
+++ b/src/main/java/com/it_jaros/jns/scan/Scanner.java
@@ -61,7 +61,7 @@ public class Scanner implements AutoCloseable {
     }
 
     private Optional<ScanResult> mapToScanResult(Throwable error) {
-        if (error instanceof RejectedExecutionException) {
+        if (isCauseChainInstanceOf(error, RejectedExecutionException.class, InterruptedException.class)) {
             // happens when Ctrl-C is pressed
             // we don't want to tell the user that
             // the host had an error because it did
@@ -71,11 +71,6 @@ public class Scanner implements AutoCloseable {
         }
 
         if (error instanceof ScanHostException e) {
-            if (isCauseChainInstanceOf(e, RejectedExecutionException.class, InterruptedException.class)) {
-                // see comment above
-                return Optional.empty();
-            }
-
             return Optional.of(ScanResult.from(e));
         }
 
@@ -83,18 +78,17 @@ public class Scanner implements AutoCloseable {
     }
 
     private boolean isCauseChainInstanceOf(Throwable e, Class<?> ...classesToCheckFor) {
-        Throwable causeToCheckFor = e.getCause();
-        if (causeToCheckFor == null) {
+        if (e == null) {
             return false;
         }
 
         for (Class<?> clazz : classesToCheckFor) {
-            if (clazz.isInstance(causeToCheckFor)) {
+            if (clazz.isInstance(e)) {
                 return true;
             }
         }
 
-        return isCauseChainInstanceOf(causeToCheckFor, classesToCheckFor);
+        return isCauseChainInstanceOf(e.getCause(), classesToCheckFor);
     }
 
     public boolean awaitTermination(Duration duration) throws InterruptedException {