Modified since adding a DOM attribute with value null is a safe operation.

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

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

@@ -195,13 +195,9 @@ public class SocketReadThread extends Thread {
                 catch(IllegalArgumentException e) {
                     // The original packet contains a malformed JID so answer an error
                     Message reply = new Message();
-                    if (doc.attributeValue("id") != null) {
-                        reply.setID(doc.attributeValue("id"));
-                    }
+                    reply.setID(doc.attributeValue("id"));
                     reply.setTo(session.getAddress());
-                    if (doc.attributeValue("to") != null) {
-                        reply.getElement().addAttribute("from", doc.attributeValue("to"));
-                    }
+                    reply.getElement().addAttribute("from", doc.attributeValue("to"));
                     reply.setError(PacketError.Condition.jid_malformed);
                     session.process(reply);
                     continue;
@@ -219,13 +215,9 @@ public class SocketReadThread extends Thread {
                 catch(IllegalArgumentException e) {
                     // The original packet contains a malformed JID so answer an error
                     Presence reply = new Presence();
-                    if (doc.attributeValue("id") != null) {
-                        reply.setID(doc.attributeValue("id"));
-                    }
+                    reply.setID(doc.attributeValue("id"));
                     reply.setTo(session.getAddress());
-                    if (doc.attributeValue("to") != null) {
-                        reply.getElement().addAttribute("from", doc.attributeValue("to"));
-                    }
+                    reply.getElement().addAttribute("from", doc.attributeValue("to"));
                     reply.setError(PacketError.Condition.jid_malformed);
                     session.process(reply);
                     continue;
@@ -248,9 +240,7 @@ public class SocketReadThread extends Thread {
                     if (!doc.elements().isEmpty()) {
                         reply.setChildElement(((Element) doc.elements().get(0)).createCopy());
                     }
-                    if (doc.attributeValue("id") != null) {
-                        reply.setID(doc.attributeValue("id"));
-                    }
+                    reply.setID(doc.attributeValue("id"));
                     reply.setTo(session.getAddress());
                     if (doc.attributeValue("to") != null) {
                         reply.getElement().addAttribute("from", doc.attributeValue("to"));