From a059dfab2c53921e99a79a9e7ec9f4503bfac082 Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Sat, 9 Aug 2014 11:35:49 +0200
Subject: fixed very rare npe

---
 src/eu/siacs/conversations/parser/IqParser.java | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'src/eu/siacs')

diff --git a/src/eu/siacs/conversations/parser/IqParser.java b/src/eu/siacs/conversations/parser/IqParser.java
index 49268450..a22ff6a5 100644
--- a/src/eu/siacs/conversations/parser/IqParser.java
+++ b/src/eu/siacs/conversations/parser/IqParser.java
@@ -27,14 +27,16 @@ public class IqParser extends AbstractParser implements OnIqPacketReceived {
 				if (!contact.getOption(Contact.Options.DIRTY_PUSH)) {
 					contact.setServerName(name);
 				}
-				if (subscription.equals("remove")) {
-					contact.resetOption(Contact.Options.IN_ROSTER);
-					contact.resetOption(Contact.Options.DIRTY_DELETE);
-					contact.resetOption(Contact.Options.PREEMPTIVE_GRANT);
-				} else {
-					contact.setOption(Contact.Options.IN_ROSTER);
-					contact.resetOption(Contact.Options.DIRTY_PUSH);
-					contact.parseSubscriptionFromElement(item);
+				if (subscription!=null) {
+					if (subscription.equals("remove")) {
+						contact.resetOption(Contact.Options.IN_ROSTER);
+						contact.resetOption(Contact.Options.DIRTY_DELETE);
+						contact.resetOption(Contact.Options.PREEMPTIVE_GRANT);
+					} else {
+						contact.setOption(Contact.Options.IN_ROSTER);
+						contact.resetOption(Contact.Options.DIRTY_PUSH);
+						contact.parseSubscriptionFromElement(item);
+					}
 				}
 			}
 		}
-- 
cgit v1.2.3