Fixed problem when renaming occupant's nickname. JM-186

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

src/java/org/jivesoftware/messenger/muc/spi/MUCRoomImpl.java

@@ -1247,10 +1247,14 @@ public class MUCRoomImpl implements MUCRoom {
 
     public void nicknameChanged(String oldNick, String newNick) {
         // Associate the existing MUCRole with the new nickname
-        occupants.put(newNick.toLowerCase(), occupants.get(oldNick.toLowerCase()));
+        MUCRole occupant = occupants.get(oldNick.toLowerCase());
+        // Check that we still have an occupant for the old nickname
+        if (occupant != null) {
+            occupants.put(newNick.toLowerCase(), occupant);
             // Remove the old nickname
             occupants.remove(oldNick.toLowerCase());
         }
+    }
 
     public void changeSubject(Message packet, MUCRole role) throws ForbiddenException {
         if ((canOccupantsChangeSubject() && role.getRole().compareTo(MUCRole.Role.visitor) < 0) ||