OF-803 Message Carbons may throw org.dom4j.IllegalAddException, resulting in disconnection

60141ddf · Christian Schudt · 6e102ccf · 60141ddf · 60141ddf
Commit 60141ddf authored May 13, 2014 by Christian Schudt
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 6 deletions

Forwarded.java src/java/org/jivesoftware/openfire/forward/Forwarded.java +5 -4

ForwardTest.java ...t/java/org/jivesoftware/openfire/forward/ForwardTest.java +5 -2

No files found.
--- a/src/java/org/jivesoftware/openfire/forward/Forwarded.java
+++ b/src/java/org/jivesoftware/openfire/forward/Forwarded.java
@@ -12,15 +12,16 @@ public class Forwarded extends PacketExtension {
    public Forwarded(Message message) {
        super("forwarded", "urn:xmpp:forward:0");

-        message.getElement().setQName(QName.get("message", "jabber:client"));
+        Message copy = message.createCopy();

-        for (Object element : message.getElement().elements()) {
+        copy.getElement().setQName(QName.get("message", "jabber:client"));
+
+        for (Object element : copy.getElement().elements()) {
            if (element instanceof Element) {
                Element el = (Element) element;
                el.setQName(QName.get(el.getName(), "jabber:client"));
            }
        }
-
-        element.add(message.getElement());
+        element.add(copy.getElement());
    }
 }
--- a/src/test/java/org/jivesoftware/openfire/forward/ForwardTest.java
+++ b/src/test/java/org/jivesoftware/openfire/forward/ForwardTest.java
@@ -17,7 +17,10 @@ public class ForwardTest {
        message.setBody("Tests");

        Forwarded forwarded = new Forwarded(message);
-        String xml = forwarded.getElement().asXML();
-        assertEquals("<forwarded xmlns=\"urn:xmpp:forward:0\"><message xmlns=\"jabber:client\" type=\"chat\"><body>Tests</body></message></forwarded>", xml);
+        Forwarded forwarded2 = new Forwarded(message);
+        String xml1 = forwarded.getElement().asXML();
+        String xml2 = forwarded2.getElement().asXML();
+        assertEquals("<forwarded xmlns=\"urn:xmpp:forward:0\"><message xmlns=\"jabber:client\" type=\"chat\"><body>Tests</body></message></forwarded>", xml1);
+        assertEquals("<forwarded xmlns=\"urn:xmpp:forward:0\"><message xmlns=\"jabber:client\" type=\"chat\"><body>Tests</body></message></forwarded>", xml2);
    }
 }