Merge pull request #699 from surevine/pr546

OF-1240 Disallow empty nicknames in rooms with reserved nicknames

Merge pull request #699 from surevine/pr546
OF-1240 Disallow empty nicknames in rooms with reserved nicknames
9e14d4f7 · Dave Cridland · GitHub · 1fb12d9a · 12de52b9 · 9e14d4f7
Commit 9e14d4f7 authored Dec 13, 2016 by Dave Cridland Committed by GitHub Dec 13, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

LocalMUCRoom.java src/java/org/jivesoftware/openfire/muc/spi/LocalMUCRoom.java +2 -0

No files found.
--- a/src/java/org/jivesoftware/openfire/muc/spi/LocalMUCRoom.java
+++ b/src/java/org/jivesoftware/openfire/muc/spi/LocalMUCRoom.java
@@ -1620,6 +1620,8 @@ public class LocalMUCRoom implements MUCRoom, GroupEventListener {
                if (!nickname.equals(members.get(bareJID))) {
                    throw new ConflictException();
                }
+            } else if (isLoginRestrictedToNickname() && (nickname == null || nickname.trim().length() == 0)) {
+                throw new ConflictException();
            }
            // Check that the room always has an owner
            if (owners.contains(bareJID) && owners.size() == 1) {