Fixed NPE when display name is null. JM-552

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/trunk@3383 b35dd754-fafc-0310-a699-88a17e54d16e

src/java/org/jivesoftware/wildfire/roster/RosterItem.java

@@ -333,7 +333,7 @@ public class RosterItem implements Cacheable {
                     Group group = GroupManager.getInstance().getGroup(groupName);
                     // Get the display name of the group
                     String displayName = group.getProperties().get("sharedRoster.displayName");
-                    if (displayName.equals(groupName)) {
+                    if (displayName != null && displayName.equals(groupName)) {
                         // Remove the shared group from the list (since it exists)
                         it.remove();
                     }
@@ -343,7 +343,7 @@ public class RosterItem implements Cacheable {
                     for (Group group : existingGroups) {
                         // Get the display name of the group
                         String displayName = group.getProperties().get("sharedRoster.displayName");
-                        if (displayName.equals(groupName)) {
+                        if (displayName != null && displayName.equals(groupName)) {
                             // Remove the shared group from the list (since it exists)
                             it.remove();
                         }