From 9015d0a1fc5679289e838d9437508b31713f957f Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Wed, 26 Sep 2018 10:18:56 +0200
Subject: [PATCH] interrupt sub thread in resolver

---
 src/main/java/eu/siacs/conversations/utils/Resolver.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/java/eu/siacs/conversations/utils/Resolver.java b/src/main/java/eu/siacs/conversations/utils/Resolver.java
index 6717b8a3f432e3bae04249ab2b30d9942da0f0ee..a810454343d00d047509a07bfadc0d4b142716e6 100644
--- a/src/main/java/eu/siacs/conversations/utils/Resolver.java
+++ b/src/main/java/eu/siacs/conversations/utils/Resolver.java
@@ -120,7 +120,12 @@ public class Resolver {
                 }
             }
         } catch (InterruptedException e) {
-            return results;
+            for(Thread thread : threads) {
+                thread.interrupt();
+            }
+            synchronized (results) {
+                return new ArrayList<>(results);
+            }
         }
     }