Do not allow owners, admins or outcasts to have duplicated JIDs. JM-828

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

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

@@ -999,6 +999,11 @@ public class MUCRoomImpl implements MUCRoom {
         if (MUCRole.Affiliation.owner != sendRole.getAffiliation()) {
             throw new ForbiddenException();
         }
+        // Check if user is already an owner
+        if (owners.contains(bareJID)) {
+            // Do nothing
+            return Collections.emptyList();
+        }
         owners.add(bareJID);
         // Remove the user from other affiliation lists
         if (removeAdmin(bareJID)) {
@@ -1042,6 +1047,11 @@ public class MUCRoomImpl implements MUCRoom {
         if (owners.contains(bareJID) && owners.size() == 1) {
             throw new ConflictException();
         }
+        // Check if user is already an admin
+        if (admins.contains(bareJID)) {
+            // Do nothing
+            return Collections.emptyList();
+        }
         admins.add(bareJID);
         // Remove the user from other affiliation lists
         if (removeOwner(bareJID)) {
@@ -1151,6 +1161,11 @@ public class MUCRoomImpl implements MUCRoom {
         if (owners.contains(bareJID) && owners.size() == 1) {
             throw new ConflictException();
         }
+        // Check if user is already an outcast
+        if (outcasts.contains(bareJID)) {
+            // Do nothing
+            return Collections.emptyList();
+        }
         // Update the presence with the new affiliation and inform all occupants
         JID actorJID = null;
         // actorJID will be null if the room itself (ie. via admin console) made the request