Ignore presence packets sent to the server itself. JM-810

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

src/java/org/jivesoftware/wildfire/handler/PresenceSubscribeHandler.java

@@ -78,6 +78,7 @@ public class PresenceSubscribeHandler extends BasicModule implements ChannelHand
 
     private RoutingTable routingTable;
     private XMPPServer localServer;
+    private String serverName;
     private PacketDeliverer deliverer;
     private PresenceManager presenceManager;
     private RosterManager rosterManager;
@@ -88,11 +89,24 @@ public class PresenceSubscribeHandler extends BasicModule implements ChannelHand
     }
 
     public void process(Packet xmppPacket) throws PacketException {
-        Presence presence = (Presence)xmppPacket;
+        Presence presence = (Presence) xmppPacket;
         try {
             JID senderJID = presence.getFrom();
             JID recipientJID = presence.getTo();
             Presence.Type type = presence.getType();
+
+            // Reject presence subscription requests sent to the local server itself.
+            if (recipientJID == null || recipientJID.toString().equals(serverName)) {
+                if (type == Presence.Type.subscribe) {
+                    Presence reply = new Presence();
+                    reply.setTo(senderJID);
+                    reply.setFrom(recipientJID);
+                    reply.setType(Presence.Type.unsubscribed);
+                    deliverer.deliver(reply);
+                }
+                return;
+            }
+
             try {
                 Roster senderRoster = getRoster(senderJID);
                 if (senderRoster != null) {
@@ -458,6 +472,7 @@ public class PresenceSubscribeHandler extends BasicModule implements ChannelHand
     public void initialize(XMPPServer server) {
         super.initialize(server);
         localServer = server;
+        serverName = server.getServerInfo().getName();
         routingTable = server.getRoutingTable();
         deliverer = server.getPacketDeliverer();
         presenceManager = server.getPresenceManager();