aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java
diff options
context:
space:
mode:
authorChristian Schneppe <kriztan@users.noreply.github.com>2020-02-08 16:33:56 +0100
committerGitHub <noreply@github.com>2020-02-08 16:33:56 +0100
commit2d5a7e013a1c88616cca89ac4ac5ab2190971ef3 (patch)
tree3db1584a7ba0d6d8f14154039aff2cd8929db36b /src/main/java
parentf0a05e133c4cb001eefc1a4d567fb3ce60f4f544 (diff)
parente125944cbce225bc42a7a7054832f8f787025e6c (diff)
Merge pull request #448 from genofire/resolver-fix
[BUGFIX] happy eye: null pointer if no connection was etablished
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/de/pixart/messenger/utils/Resolver.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/main/java/de/pixart/messenger/utils/Resolver.java b/src/main/java/de/pixart/messenger/utils/Resolver.java
index 0037e9563..86bdc40aa 100644
--- a/src/main/java/de/pixart/messenger/utils/Resolver.java
+++ b/src/main/java/de/pixart/messenger/utils/Resolver.java
@@ -275,6 +275,10 @@ 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 {