The from attribute of presence probes should be a full JID. JM-174

git-svn-id: http://svn.igniterealtime.org/svn/repos/messenger/trunk@1050 b35dd754-fafc-0310-a699-88a17e54d16e

src/java/org/jivesoftware/messenger/PresenceManager.java

@@ -126,14 +126,6 @@ public interface PresenceManager {
      */
     public void setOffline(JID jid);
 
-    /**
-     * Probes the presence of the given XMPPAddress and attempts to send it to the given user.
-     *
-     * @param prober The user requesting the probe
-     * @param probee The XMPPAddress whos presence we would like sent have have probed
-     */
-    public void probePresence(String prober, JID probee);
-
     /**
      * Probes the presence of the given XMPPAddress and attempts to send it to the given user.
      *

src/java/org/jivesoftware/messenger/handler/PresenceUpdateHandler.java

@@ -183,7 +183,7 @@ public class PresenceUpdateHandler extends BasicModule implements ChannelHandler
                 }
                 if (item.getSubStatus() == RosterItem.SUB_TO
                         || item.getSubStatus() == RosterItem.SUB_BOTH) {
-                    presenceManager.probePresence(username, item.getJid());
+                    presenceManager.probePresence(session.getAddress(), item.getJid());
                 }
             }
             // deliver offline messages if any

src/java/org/jivesoftware/messenger/roster/Roster.java

@@ -308,7 +308,7 @@ public class Roster implements Cacheable {
             broadcast(item);
         }
         if (item.getSubStatus() == RosterItem.SUB_BOTH || item.getSubStatus() == RosterItem.SUB_TO) {
-            presenceManager.probePresence(username, item.getJid());
+            probePresence(item.getJid());
         }
     }
 
@@ -496,6 +496,15 @@ public class Roster implements Cacheable {
         broadcast(roster);
     }
 
+    /**
+     * Sends a presence probe to the probee for each connected resource of this user.
+     */
+    private void probePresence(JID probee) {
+        for (ClientSession session : sessionManager.getSessions(username)) {
+            presenceManager.probePresence(session.getAddress(), probee);
+        }
+    }
+
     public int getCachedSize() {
         // Approximate the size of the object in bytes by calculating the size
         // of each field.
@@ -589,7 +598,7 @@ public class Roster implements Cacheable {
         broadcast(item);
         // Probe the presence of the new group user
         if (item.getSubStatus() == RosterItem.SUB_BOTH || item.getSubStatus() == RosterItem.SUB_TO) {
-            presenceManager.probePresence(username, item.getJid());
+            probePresence(item.getJid());
         }
     }
 
@@ -680,7 +689,7 @@ public class Roster implements Cacheable {
         broadcast(item);
         // Probe the presence of the new group user
         if (item.getSubStatus() == RosterItem.SUB_BOTH || item.getSubStatus() == RosterItem.SUB_TO) {
-            presenceManager.probePresence(username, item.getJid());
+            probePresence(item.getJid());
         }
     }
 

src/java/org/jivesoftware/messenger/spi/PresenceManagerImpl.java

@@ -16,8 +16,6 @@ import org.jivesoftware.messenger.container.BasicModule;
 import org.jivesoftware.messenger.user.User;
 import org.jivesoftware.messenger.user.UserManager;
 import org.jivesoftware.messenger.user.UserNotFoundException;
-import org.jivesoftware.util.Cache;
-import org.jivesoftware.util.JiveConstants;
 import org.jivesoftware.util.LocaleUtils;
 import org.jivesoftware.util.Log;
 import org.xmpp.packet.JID;
@@ -37,11 +35,6 @@ public class PresenceManagerImpl extends BasicModule implements PresenceManager
     private Map<String, Presence> onlineGuests;
     private Map<String, Presence> onlineUsers;
 
-    /**
-     * table: key jid.getUserJid().toLowerCase() (String); value Presence
-     */
-    private Cache foreignUserCache;
-
     private UserManager userManager;
     private SessionManager sessionManager;
     private XMPPServer server;
@@ -57,13 +50,9 @@ public class PresenceManagerImpl extends BasicModule implements PresenceManager
     }
 
     private void initializeCaches() {
-        int foreignCacheSize = 128 * 1024 * 8; // 1 MB
-
         // create caches - no size limit and never expire for presence caches
-        long HOUR = JiveConstants.HOUR;
         onlineGuests = new ConcurrentHashMap<String, Presence>();
         onlineUsers = new ConcurrentHashMap<String, Presence>();
-        foreignUserCache = new Cache("Foreign Users", foreignCacheSize, HOUR);
     }
 
     public int getOnlineGuestCount() {
@@ -283,18 +272,21 @@ public class PresenceManagerImpl extends BasicModule implements PresenceManager
         return null;
     }
 
-    public void probePresence(String prober, JID probee) {
+    public void probePresence(JID prober, JID probee) {
         try {
             Component component = getPresenceComponent(probee);
             if (server.isLocal(probee)) {
+                // If the probee is a local user then don't send a probe to the contact's server.
+                // But instead just send the contact's presence to the prober
                 if (probee.getNode() != null && !"".equals(probee.getNode())) {
                     Collection<ClientSession> sessions =
                             sessionManager.getSessions(probee.getNode());
                     for (ClientSession session : sessions) {
                         Presence presencePacket = session.getPresence().createCopy();
                         presencePacket.setFrom(session.getAddress());
+                        presencePacket.setTo(prober);
                         try {
-                            sessionManager.userBroadcast(prober, presencePacket);
+                            deliverer.deliver(presencePacket);
                         }
                         catch (Exception e) {
                             Log.error(LocaleUtils.getLocalizedString("admin.error"), e);
@@ -303,63 +295,25 @@ public class PresenceManagerImpl extends BasicModule implements PresenceManager
                 }
             }
             else if (component != null) {
+                // If the probee belongs to a component then ask the component to process the
+                // probe presence
                 Presence presence = new Presence();
                 presence.setType(Presence.Type.probe);
-                presence.setFrom(server.createJID(prober, ""));
+                presence.setFrom(prober);
                 presence.setTo(probee);
                 component.processPacket(presence);
             }
             else {
-                Presence presence = (Presence) foreignUserCache.get(probee.toBareJID());
-                if (presence != null) {
-                    Presence presencePacket = presence.createCopy();
-                    presencePacket.setFrom(probee);
-                    try {
-                        sessionManager.userBroadcast(prober, presencePacket);
-                    }
-                    catch (Exception e) {
-                        Log.error(LocaleUtils.getLocalizedString("admin.error"), e);
-                    }
+                String serverDomain = server.getServerInfo().getName();
+                // Check if the probee may be hosted by this server
+                if (!probee.getDomain().contains(serverDomain)) {
+                    // TODO Implete when s2s is implemented
                 }
                 else {
-                    JID proberAddress = server.createJID(prober, "");
-                    componentManager.addPresenceRequest(proberAddress, probee);
-                }
-            }
-        }
-        catch (Exception e) {
-            Log.error(LocaleUtils.getLocalizedString("admin.error"), e);
-        }
-    }
-
-    public void probePresence(JID prober, JID probee) {
-        try {
-            if (server.isLocal(probee)) {
-                Collection<ClientSession> sessions =
-                        sessionManager.getSessions(probee.getNode());
-                for (ClientSession session : sessions) {
-                    Presence presencePacket = session.getPresence().createCopy();
-                    presencePacket.setFrom(session.getAddress());
-                    try {
-                        deliverer.deliver(presencePacket);
-                    }
-                    catch (Exception e) {
-                        Log.error(LocaleUtils.getLocalizedString("admin.error"), e);
-                    }
-                }
-            }
-            else {
-                Presence presence =
-                        (Presence) foreignUserCache.get(probee.toBareJID());
-                if (presence != null) {
-                    Presence presencePacket = presence.createCopy();
-                    presencePacket.setFrom(probee);
-                    try {
-                        deliverer.deliver(presencePacket);
-                    }
-                    catch (Exception e) {
-                        Log.error(LocaleUtils.getLocalizedString("admin.error"), e);
-                    }
+                    // The probee may be related to a component that has not yet been connected so
+                    // we will keep a registry of this presence probe. The component will answer
+                    // this presence probe when he becomes online
+                    componentManager.addPresenceRequest(prober, probee);
                 }
             }
         }