diff options
| author | md_5 <md_5@bigpond.com> | 2012-03-01 16:23:21 +1100 |
|---|---|---|
| committer | md_5 <md_5@bigpond.com> | 2012-03-01 16:23:21 +1100 |
| commit | 3099855562b3223ec13b796dee2679c7a8e0411b (patch) | |
| tree | 159c56ffea606e833c2a00ed7a99cf3c9d54a24f /EssentialsXMPP | |
| parent | 3f26d4ad9841b4ab30253222217edaaa60db3075 (diff) | |
| parent | 833a5b2b552f297a9c5aeec3e11d58f0486c7e24 (diff) | |
| download | Essentials-3099855562b3223ec13b796dee2679c7a8e0411b.tar Essentials-3099855562b3223ec13b796dee2679c7a8e0411b.tar.gz Essentials-3099855562b3223ec13b796dee2679c7a8e0411b.tar.lz Essentials-3099855562b3223ec13b796dee2679c7a8e0411b.tar.xz Essentials-3099855562b3223ec13b796dee2679c7a8e0411b.zip | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'EssentialsXMPP')
| -rw-r--r-- | EssentialsXMPP/src/com/earth2me/essentials/xmpp/UserManager.java | 4 | ||||
| -rw-r--r-- | EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/UserManager.java b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/UserManager.java index 85ef50949..a35312129 100644 --- a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/UserManager.java +++ b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/UserManager.java @@ -36,7 +36,7 @@ public class UserManager implements IConf public final String getUserByAddress(final String search) { - final List<String> usernames = users.getKeys(null); + final Set<String> usernames = users.getKeys(false); for (String username : usernames) { final String address = users.getString(username + "." + ADDRESS, null); @@ -73,7 +73,7 @@ public class UserManager implements IConf { users.load(); spyusers.clear(); - final List<String> keys = users.getKeys(null); + final Set<String> keys = users.getKeys(false); for (String key : keys) { if (isSpy(key)) diff --git a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java index 72bdb113d..bb44d3127 100644 --- a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java +++ b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java @@ -183,7 +183,7 @@ public class XMPPManager extends Handler implements MessageListener, ChatManager if (config.getBoolean("log-enabled", false)) { LOGGER.addHandler(this); - logUsers = config.getStringList("log-users", new ArrayList<String>()); + logUsers = config.getStringList("log-users"); final String level = config.getString("log-level", "info"); try { @@ -351,7 +351,7 @@ public class XMPPManager extends Handler implements MessageListener, ChatManager private void sendCommand(final Chat chat, final String message) { - if (config.getStringList("op-users", new ArrayList<String>()).contains(StringUtils.parseBareAddress(chat.getParticipant()))) + if (config.getStringList("op-users").contains(StringUtils.parseBareAddress(chat.getParticipant()))) { try { |