From b636883ce656fe066d55e46de5ff7f763a4e04a5 Mon Sep 17 00:00:00 2001 From: Alexander Tovstonozhenko Date: Fri, 19 May 2017 10:16:18 +0300 Subject: [PATCH] Fix NPE in hashCode() in Occupant when jid is null Fixes SMACK-764. --- .../src/main/java/org/jivesoftware/smackx/muc/Occupant.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/Occupant.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/Occupant.java index 044a027e2..d02477575 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/Occupant.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/Occupant.java @@ -124,7 +124,7 @@ public class Occupant { int result; result = affiliation.hashCode(); result = 17 * result + role.hashCode(); - result = 17 * result + jid.hashCode(); + result = 17 * result + (jid != null ? jid.hashCode() : 0); result = 17 * result + (nick != null ? nick.hashCode() : 0); return result; }