Replace invalid presence types with an available presence type. JM-340

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

src/java/org/jivesoftware/messenger/net/SocketReader.java

@@ -186,7 +186,7 @@ public abstract class SocketReader implements Runnable {
                 try {
                     packet = new Presence(doc);
                 }
-                catch(IllegalArgumentException e) {
+                catch (IllegalArgumentException e) {
                     // The original packet contains a malformed JID so answer an error
                     Presence reply = new Presence();
                     reply.setID(doc.attributeValue("id"));
@@ -196,6 +196,15 @@ public abstract class SocketReader implements Runnable {
                     session.process(reply);
                     continue;
                 }
+                try {
+                    packet.getType();
+                }
+                catch (IllegalArgumentException e) {
+                    Log.warn("Invalid presence type", e);
+                    // The presence packet contains an invalid presence type so replace it with
+                    // an available presence type
+                    packet.setType(null);
+                }
                 processPresence(packet);
             }
             else if ("iq".equals(tag)) {