Commit d6ddea20 authored by Gaston Dombiak's avatar Gaston Dombiak Committed by gato

Fixed NPE. JM-918

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/trunk@6450 b35dd754-fafc-0310-a699-88a17e54d16e
parent 821fe9b9
...@@ -680,7 +680,10 @@ public class Roster implements Cacheable { ...@@ -680,7 +680,10 @@ public class Roster implements Cacheable {
// Set the groups to broadcast (include personal and shared groups) // Set the groups to broadcast (include personal and shared groups)
List<String> groups = new ArrayList<String>(item.getGroups()); List<String> groups = new ArrayList<String>(item.getGroups());
for (Group sharedGroup : item.getSharedGroups()) { for (Group sharedGroup : item.getSharedGroups()) {
groups.add(sharedGroup.getProperties().get("sharedRoster.displayName")); String displayName = sharedGroup.getProperties().get("sharedRoster.displayName");
if (displayName != null) {
groups.add(displayName);
}
} }
org.xmpp.packet.Roster roster = new org.xmpp.packet.Roster(); org.xmpp.packet.Roster roster = new org.xmpp.packet.Roster();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment