Fixed deadlock that could freeze entire JVM. JM-1372

git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/branches@10437 b35dd754-fafc-0310-a699-88a17e54d16e

openfire_3_5_2/src/java/org/jivesoftware/openfire/muc/spi/IQAdminHandler.java

@@ -223,56 +223,50 @@ public class IQAdminHandler {
                         jid = room.getOccupant(nick).getUserAddress();
                     }
 
-                    room.lock.writeLock().lock();
-                    try {
-                        if ("moderator".equals(target)) {
-                            // Add the user as a moderator of the room based on the full JID
-                            presences.add(room.addModerator(jid, senderRole));
-                        }
-                        else if ("participant".equals(target)) {
-                            // Add the user as a participant of the room based on the full JID
-                            presences.add(room.addParticipant(jid,
-                                    item.elementTextTrim("reason"),
-                                    senderRole));
-                        }
-                        else if ("visitor".equals(target)) {
-                            // Add the user as a visitor of the room based on the full JID
-                            presences.add(room.addVisitor(jid, senderRole));
-                        }
-                        else if ("member".equals(target)) {
-                            // Add the user as a member of the room based on the bare JID
-                            boolean hadAffiliation = room.getAffiliation(jid.toBareJID()) != MUCRole.Affiliation.none;
-                            presences.addAll(room.addMember(jid.toBareJID(), nick, senderRole));
-                            // If the user had an affiliation don't send an invitation. Otherwise
-                            // send an invitation if the room is members-only
-                            if (!hadAffiliation && room.isMembersOnly()) {
-                                room.sendInvitation(jid, null, senderRole, null);
-                            }
-                        }
-                        else if ("outcast".equals(target)) {
-                            // Add the user as an outcast of the room based on the bare JID
-                            presences.addAll(room.addOutcast(jid.toBareJID(), item.elementTextTrim("reason"), senderRole));
+                    if ("moderator".equals(target)) {
+                        // Add the user as a moderator of the room based on the full JID
+                        presences.add(room.addModerator(jid, senderRole));
+                    }
+                    else if ("participant".equals(target)) {
+                        // Add the user as a participant of the room based on the full JID
+                        presences.add(room.addParticipant(jid,
+                                item.elementTextTrim("reason"),
+                                senderRole));
+                    }
+                    else if ("visitor".equals(target)) {
+                        // Add the user as a visitor of the room based on the full JID
+                        presences.add(room.addVisitor(jid, senderRole));
+                    }
+                    else if ("member".equals(target)) {
+                        // Add the user as a member of the room based on the bare JID
+                        boolean hadAffiliation = room.getAffiliation(jid.toBareJID()) != MUCRole.Affiliation.none;
+                        presences.addAll(room.addMember(jid.toBareJID(), nick, senderRole));
+                        // If the user had an affiliation don't send an invitation. Otherwise
+                        // send an invitation if the room is members-only
+                        if (!hadAffiliation && room.isMembersOnly()) {
+                            room.sendInvitation(jid, null, senderRole, null);
                         }
-                        else if ("none".equals(target)) {
-                            if (hasAffiliation) {
-                                // Set that this jid has a NONE affiliation based on the bare JID
-                                presences.addAll(room.addNone(jid.toBareJID(), senderRole));
-                            }
-                            else {
-                                // Kick the user from the room
-                                if (MUCRole.Role.moderator != senderRole.getRole()) {
-                                    throw new ForbiddenException();
-                                }
-                                presences.add(room.kickOccupant(jid, senderRole.getUserAddress(),
-                                        item.elementTextTrim("reason")));
-                            }
+                    }
+                    else if ("outcast".equals(target)) {
+                        // Add the user as an outcast of the room based on the bare JID
+                        presences.addAll(room.addOutcast(jid.toBareJID(), item.elementTextTrim("reason"), senderRole));
+                    }
+                    else if ("none".equals(target)) {
+                        if (hasAffiliation) {
+                            // Set that this jid has a NONE affiliation based on the bare JID
+                            presences.addAll(room.addNone(jid.toBareJID(), senderRole));
                         }
                         else {
-                            reply.setError(PacketError.Condition.bad_request);
+                            // Kick the user from the room
+                            if (MUCRole.Role.moderator != senderRole.getRole()) {
+                                throw new ForbiddenException();
+                            }
+                            presences.add(room.kickOccupant(jid, senderRole.getUserAddress(),
+                                    item.elementTextTrim("reason")));
                         }
                     }
-                    finally {
-                        room.lock.writeLock().unlock();
+                    else {
+                        reply.setError(PacketError.Condition.bad_request);
                     }
                 }
                 catch (UserNotFoundException e) {

openfire_3_5_2/src/java/org/jivesoftware/openfire/muc/spi/LocalMUCUser.java

@@ -285,13 +285,7 @@ public class LocalMUCUser implements MUCUser {
                                         // Add the user as a member of the room if the room is
                                         // members only
                                         if (room.isMembersOnly()) {
-                                            room.lock.writeLock().lock();
-                                            try {
-                                                room.addMember(info.attributeValue("to"), null, role);
-                                            }
-                                            finally {
-                                                room.lock.writeLock().unlock();
-                                            }
+                                            room.addMember(info.attributeValue("to"), null, role);
                                         }
 
                                         // Send the invitation to the invitee
@@ -560,4 +554,4 @@ public class LocalMUCUser implements MUCUser {
             }
         }
     }
-}
\ No newline at end of file
+}