diff options
| author | lookshe <github@lookshe.org> | 2015-04-11 14:15:07 +0200 |
|---|---|---|
| committer | lookshe <github@lookshe.org> | 2015-04-11 14:15:07 +0200 |
| commit | df63c14617bc8d665bfeac62cde0b29e6aa98873 (patch) | |
| tree | b825c0c87bcd9833ecfad85ecc5c0901ea4d77eb /src/main/java/eu/siacs/conversations/utils/DNSHelper.java | |
| parent | 87e56b534ad41199380c97e16ad25acbd077878c (diff) | |
| parent | e17b75511e7c9d8206939b742972021c5c9d6b86 (diff) | |
Merge branch 'trz/master' of ssh://git.fucktheforce.de/conversations into trz/master
Diffstat (limited to 'src/main/java/eu/siacs/conversations/utils/DNSHelper.java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/utils/DNSHelper.java | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/main/java/eu/siacs/conversations/utils/DNSHelper.java b/src/main/java/eu/siacs/conversations/utils/DNSHelper.java index a09b4d0f..bcb2ca44 100644 --- a/src/main/java/eu/siacs/conversations/utils/DNSHelper.java +++ b/src/main/java/eu/siacs/conversations/utils/DNSHelper.java @@ -140,18 +140,13 @@ public class DNSHelper { } ArrayList<Bundle> values = new ArrayList<>(); for (SRV srv : result) { - boolean added = false; if (ips6.containsKey(srv.getName())) { values.add(createNamePortBundle(srv.getName(),srv.getPort(),ips6)); - added = true; } if (ips4.containsKey(srv.getName())) { values.add(createNamePortBundle(srv.getName(),srv.getPort(),ips4)); - added = true; - } - if (!added) { - values.add(createNamePortBundle(srv.getName(),srv.getPort(),null)); } + values.add(createNamePortBundle(srv.getName(),srv.getPort(),null)); } bundle.putParcelableArrayList("values", values); } catch (SocketTimeoutException e) { |