OF-1271 Copy elements correctly

Adding elements and attributes to the new element doesn't work, since reparenting the old elements generates an exception. This exception wasn't logged. * Exception logged * id attribute copied, if present. * Elements copied deeply/properly. Test stanza: ``` <message xmlns="jabber:client" to="blah@conference.cridland.im" type="groupchat" id="5260"> <body>This is a message with a label.</body> <custom xmlns='tmp:custom'/> <custom-attr xmlns='tmp:custom2' attr='value'/> <custom-child xmlns='tmp:custom3'> <child>element</child> </custom-child> <custom-text xmlns='tmp:custom4'>Text here</custom-text> </message> ```

OF-1271 Copy elements correctly
Adding elements and attributes to the new element doesn't work, since reparenting the old elements generates an exception. This exception wasn't logged. * Exception logged * id attribute copied, if present. * Elements copied deeply/properly. Test stanza: ``` <message xmlns="jabber:client" to="blah@conference.cridland.im" type="groupchat" id="5260"> <body>This is a message with a label.</body> <custom xmlns='tmp:custom'/> <custom-attr xmlns='tmp:custom2' attr='value'/> <custom-child xmlns='tmp:custom3'> <child>element</child> </custom-child> <custom-text xmlns='tmp:custom4'>Text here</custom-text> </message> ```
df106421 · Dave Cridland · akrherz · eefa0f1d · df106421
Commit df106421 authored Jan 17, 2017 by Dave Cridland Committed by akrherz Feb 17, 2017
Show whitespace changes
Inline Side-by-side

Showing with 12 additions and 3 deletions

MUCRoomHistory.java src/java/org/jivesoftware/openfire/muc/MUCRoomHistory.java +12 -3

No files found.
--- a/src/java/org/jivesoftware/openfire/muc/MUCRoomHistory.java
+++ b/src/java/org/jivesoftware/openfire/muc/MUCRoomHistory.java
@@ -26,6 +26,8 @@ import org.dom4j.Namespace;
 import org.dom4j.io.SAXReader;
 import org.jivesoftware.openfire.user.UserNotFoundException;
 import org.jivesoftware.util.XMPPDateTimeFormat;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.xmpp.packet.JID;
 import org.xmpp.packet.Message;

@@ -42,6 +44,7 @@ import java.util.ListIterator;
 * @author Gaston Dombiak
 */
 public final class MUCRoomHistory {
+    private static final Logger Log = LoggerFactory.getLogger(MUCRoomHistory.class);

    private MUCRoom room;

@@ -168,15 +171,21 @@ public final class MUCRoomHistory {
                        continue;
                    }
                    Element added = message.addChildElement(child.getName(), child.getNamespaceURI());
+                    if (!child.getText().isEmpty()) {
+                        added.setText(child.getText());
+                    }
                    for (Attribute attr : (List<Attribute>)child.attributes()) {
-                        added.add(attr);
+                        added.addAttribute(attr.getQName(), attr.getValue());
                    }
                    for (Element el : (List<Element>)child.elements()) {
-                        added.add(el);
+                        added.add(el.createCopy());
+                    }
                }
+                if (element.attribute("id") != null) {
+                    message.setID(element.attributeValue("id"));
                }
            } catch (Exception ex) {
-                // log.error("Failed to parse payload XML", ex);
+                Log.error("Failed to parse payload XML", ex);
            }
        }
        message.setSubject(subject);