Skip to content

Commit fc33b6e

Browse files
author
Lloyd Watkin
committed
only perform a database look up for bare JIDs. Return direct to full JIDs or just domains.
1 parent ad4c1ec commit fc33b6e

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

src/main/java/org/buddycloud/channelserver/utils/users/OnlineResourceManager.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,15 +61,15 @@ public void subscribeToNodeListeners(BlockingQueue<Packet> outQueue) {
6161
}
6262

6363
public ArrayList<JID> getResources(JID jid) throws NodeStoreException {
64-
if (true == useDatabaseStorage) {
65-
return channelManager.onlineJids(jid);
66-
}
6764
if ((jid.getResource() != null)
6865
|| ((jid.getResource() == null) && (jid.getNode() == null))) {
6966
ArrayList<JID> user = new ArrayList<JID>();
7067
user.add(jid);
7168
return user;
7269
}
70+
if (true == useDatabaseStorage) {
71+
ArrayList<JID> jids = channelManager.onlineJids(jid);
72+
}
7373
if (!users.containsKey(jid.toBareJID())) {
7474
return new ArrayList<JID>();
7575
}

src/test/java/org/buddycloud/channelserver/utils/users/OnlineResourceManagerTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -211,9 +211,9 @@ public void ifUsingDatabaseWeSeeRequestForOnlineUsersMethod()
211211

212212
channelManager = Mockito.mock(ChannelManager.class);
213213
onlineUser = new OnlineResourceManager(configuration, channelManager);
214-
onlineUser.getResources(localUserLaptop);
214+
onlineUser.getResources(localUserNoResource);
215215
Mockito.verify(channelManager, Mockito.times(1)).onlineJids(
216-
Mockito.eq(localUserLaptop));
216+
Mockito.eq(localUserNoResource));
217217
}
218218

219219
@Test

0 commit comments

Comments
 (0)