aboutsummaryrefslogtreecommitdiffstats
path: root/src/eu/siacs/conversations/entities
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-07-01 14:53:39 +0200
committeriNPUTmice <daniel@gultsch.de>2014-07-01 14:53:39 +0200
commit6028bf4ee246eab124ff52f410aa24938082bb8c (patch)
tree0fc3e653668aa2f290f9ef0999d74ca95f709b8e /src/eu/siacs/conversations/entities
parent2738d834b450e1c0bfd2756ea2ab1900cc3aae59 (diff)
fixed npe on rare occasion of show element in presence being null
Diffstat (limited to 'src/eu/siacs/conversations/entities')
-rw-r--r--src/eu/siacs/conversations/entities/Presences.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/eu/siacs/conversations/entities/Presences.java b/src/eu/siacs/conversations/entities/Presences.java
index 77891648..acd80735 100644
--- a/src/eu/siacs/conversations/entities/Presences.java
+++ b/src/eu/siacs/conversations/entities/Presences.java
@@ -44,7 +44,7 @@ public class Presences {
}
public static int parseShow(Element show) {
- if (show == null) {
+ if ((show == null)||(show.getContent() == null)) {
return Presences.ONLINE;
} else if (show.getContent().equals("away")) {
return Presences.AWAY;