aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2015-04-16 21:55:52 +0200
committeriNPUTmice <daniel@gultsch.de>2015-04-16 21:56:03 +0200
commitc4daa08170f0e468c0407d9db91a0de0415b6bf2 (patch)
tree889f7dcd4c8ca8d95daa5fe796f6483b4834ca0e /src/main/java/eu
parent584ffbd0009ec57bcbe413857e3d16ff10f376de (diff)
fixed a bug in DNS helper code. fixes #1130
Diffstat (limited to 'src/main/java/eu')
-rw-r--r--src/main/java/eu/siacs/conversations/utils/DNSHelper.java2
-rw-r--r--src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/eu/siacs/conversations/utils/DNSHelper.java b/src/main/java/eu/siacs/conversations/utils/DNSHelper.java
index bcb2ca442..42dd1c95c 100644
--- a/src/main/java/eu/siacs/conversations/utils/DNSHelper.java
+++ b/src/main/java/eu/siacs/conversations/utils/DNSHelper.java
@@ -121,7 +121,7 @@ public class DNSHelper {
while (p > 0) {
p -= s.get(i++).getPriority();
}
- i--;
+ if (i>0) i--;
// remove is expensive, but we have only a few entries
// anyway
SRV srv = s.remove(i);
diff --git a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
index 25db8ecca..1351226ba 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
@@ -204,7 +204,7 @@ public class XmppConnection implements Runnable {
&& "nosrv".equals(result.getString("error", null))) {
socket = new Socket(account.getServer().getDomainpart(), 5222);
} else {
- throw new IOException("timeout in dns");
+ throw new IOException("unhandled exception in DNS resolver");
}
final OutputStream out = socket.getOutputStream();
tagWriter.setOutputStream(out);