From 59009ded8267ecd6eaede0ca50d40b5f46d48b56 Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Mon, 22 Sep 2014 16:04:37 +0200
Subject: fixed very rare npe

---
 src/eu/siacs/conversations/xmpp/XmppConnection.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/eu')

diff --git a/src/eu/siacs/conversations/xmpp/XmppConnection.java b/src/eu/siacs/conversations/xmpp/XmppConnection.java
index e02c772d8..796920e29 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;
-- 
cgit v1.2.3