From afcfd057d8ad9333532eeeba162c903d881d555f Mon Sep 17 00:00:00 2001
From: genofire <geno+dev@fireorbit.de>
Date: Sun, 9 Feb 2020 12:50:21 +0100
Subject: [BUGFIX] happy eyeball: concurrents resolve connect

---
 src/main/java/de/pixart/messenger/utils/Resolver.java | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'src/main/java/de/pixart/messenger/utils')

diff --git a/src/main/java/de/pixart/messenger/utils/Resolver.java b/src/main/java/de/pixart/messenger/utils/Resolver.java
index 666ec37ec..d5c23f700 100644
--- a/src/main/java/de/pixart/messenger/utils/Resolver.java
+++ b/src/main/java/de/pixart/messenger/utils/Resolver.java
@@ -282,10 +282,6 @@ public class Resolver {
         try {
             result = executor.invokeAny(r);
             executor.shutdown();
-            if (result == null) {
-                Log.i(Config.LOGTAG, Resolver.class.getSimpleName() + ": happy eyeball unable to connect to one address");
-                return null;
-            }
             Thread disconnector = new Thread(() -> {
                 while (true) {
                     try {
@@ -307,7 +303,7 @@ public class Resolver {
             Log.e(Config.LOGTAG, Resolver.class.getSimpleName() + ": happy eyeball failed: ", e);
             return null;
         } catch (ExecutionException e) {
-            Log.e(Config.LOGTAG, Resolver.class.getSimpleName() + ": happy eyeball failed: ", e);
+            Log.i(Config.LOGTAG, Resolver.class.getSimpleName() + ": happy eyeball unable to connect to one address");
             return null;
         }
     }
@@ -447,7 +443,7 @@ public class Resolver {
             if (this.socket != null && this.socket.isConnected()) {
                 return this;
             }
-            return null;
+            throw new Exception("Resolver.Result was not possible to connect - should be catched by executor");
         }
 
         public ContentValues toContentValues() {
-- 
cgit v1.2.3