Merge branch 'issues/232' of github.com:surevine/buddycloud-server-java

Author: Lloyd Watkin

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

@@ -61,26 +61,32 @@ public void subscribeToNodeListeners(BlockingQueue<Packet> outQueue) {
 	}
 
 	public ArrayList<JID> getResources(JID jid) throws NodeStoreException {
-		if ((jid.getResource() != null)
-				|| ((jid.getResource() == null) && (jid.getNode() == null))) {
-			ArrayList<JID> user = new ArrayList<JID>();
+
+		boolean isBareJid = (jid.getResource() == null);
+		boolean isServerJid = ((jid.getResource() == null) && (jid.getNode() == null));
+
+		String bareJid = jid.toBareJID();
+
+		ArrayList<JID> user = new ArrayList<JID>();
+        if (!isBareJid || isServerJid) {
 			user.add(jid);
 			return user;
 		}
+
 		if (true == useDatabaseStorage) {
-			ArrayList<JID> jids = channelManager.onlineJids(jid);
+			return channelManager.onlineJids(jid);
 		}
-		if (!users.containsKey(jid.toBareJID())) {
-			return new ArrayList<JID>();
+		if (users.containsKey(bareJid)) {
+			return users.get(bareJid);
 		}
-		return users.get(jid.toBareJID());
+		return user;
 	}
 
 	public void updateStatus(JID jid, String type) throws NodeStoreException {
 		if (!LocalDomainChecker.isLocal(jid.getDomain(), configuration)) {
 			return;
 		}
-		
+
 		ArrayList<JID> user = null;
 		if (users.containsKey(jid.toBareJID())) {
 			user = users.get(jid.toBareJID());