aboutsummaryrefslogtreecommitdiffstats
path: root/src/eu
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-09-22 16:04:37 +0200
committeriNPUTmice <daniel@gultsch.de>2014-09-22 16:04:37 +0200
commit59009ded8267ecd6eaede0ca50d40b5f46d48b56 (patch)
treec21626965dab9a6d7e9c9fbb7d7323263d86fb0a /src/eu
parent013ba16421efe1a2b2275b24bd6dc88aa6a0cca8 (diff)
fixed very rare npe
Diffstat (limited to 'src/eu')
-rw-r--r--src/eu/siacs/conversations/xmpp/XmppConnection.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/eu/siacs/conversations/xmpp/XmppConnection.java b/src/eu/siacs/conversations/xmpp/XmppConnection.java
index e02c772d..796920e2 100644
--- a/src/eu/siacs/conversations/xmpp/XmppConnection.java
+++ b/src/eu/siacs/conversations/xmpp/XmppConnection.java
@@ -656,7 +656,7 @@ public class XmppConnection implements Runnable {
Element bind = packet.findChild("bind");
if (bind != null) {
Element jid = bind.findChild("jid");
- if (jid != null) {
+ if (jid != null && jid.getContent() != null) {
account.setResource(jid.getContent().split("/",2)[1]);
if (streamFeatures.hasChild("sm", "urn:xmpp:sm:3")) {
smVersion = 3;