diff options
author | Christian Schneppe <kriztan@users.noreply.github.com> | 2020-02-08 09:00:48 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-08 09:00:48 +0100 |
commit | bf420c711a5a34ee57092018bd361fe52ec77fa4 (patch) | |
tree | aada3d998ee7f2760edda6f95ffdf46b60aef56f | |
parent | 4fac8c47e7b7c6f8f57314ca7f3662750b0a28a7 (diff) | |
parent | 8efe986962e4bfe3dbb3c1bda40e6a09422d791b (diff) |
Merge pull request #446 from genofire/resolver-fix
[BUGFIX] happy eye: null pointer on closed socket if no connection was etablished
-rw-r--r-- | src/main/java/de/pixart/messenger/utils/Resolver.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/main/java/de/pixart/messenger/utils/Resolver.java b/src/main/java/de/pixart/messenger/utils/Resolver.java index bf66b38e1..0037e9563 100644 --- a/src/main/java/de/pixart/messenger/utils/Resolver.java +++ b/src/main/java/de/pixart/messenger/utils/Resolver.java @@ -429,7 +429,10 @@ public class Resolver { @Override public Result call() throws Exception { this.connect(); - return this.socket.isConnected() ? this : null; + if (this.socket != null && this.socket.isConnected()) { + return this; + } + return null; } public ContentValues toContentValues() { |