Don't add multiple delayed delivery extension to resent messages.

The issue is that messages, which get resent from offline storage already have an older timestamp. There should not be another delayed delivery extension, which "overwrites" the old one. Messages looked like that: <message><body>...</body><delay xmlns="urn:xmpp:delay" stamp="2016-01-06T13:48:45.312Z"></delay><delay xmlns="urn:xmpp:delay" stamp="2016-01-06T13:49:56.674Z"></delay></message> Instead the original timestamp should be preserved.

Don't add multiple delayed delivery extension to resent messages.
The issue is that messages, which get resent from offline storage already have an older timestamp. There should not be another delayed delivery extension, which "overwrites" the old one. Messages looked like that: <message><body>...</body><delay xmlns="urn:xmpp:delay" stamp="2016-01-06T13:48:45.312Z"></delay><delay xmlns="urn:xmpp:delay" stamp="2016-01-06T13:49:56.674Z"></delay></message> Instead the original timestamp should be preserved.
81363d82 · Christian Schudt · 193091d7 · 81363d82
Commit 81363d82 authored Jan 06, 2016 by Christian Schudt
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

StreamManager.java ...jivesoftware/openfire/streammanagement/StreamManager.java +5 -3

No files found.
--- a/src/java/org/jivesoftware/openfire/streammanagement/StreamManager.java
+++ b/src/java/org/jivesoftware/openfire/streammanagement/StreamManager.java
@@ -178,9 +178,11 @@ public class StreamManager {
 					for (StreamManager.UnackedPacket unacked : unacknowledgedStanzas) {
 						if (unacked.packet instanceof Message) {
 							Message m = (Message) unacked.packet;
-							Element delayInformation = m.addChildElement("delay", "urn:xmpp:delay");
-							delayInformation.addAttribute("stamp", XMPPDateTimeFormat.format(unacked.timestamp));
-							delayInformation.addAttribute("from", serverAddress.toBareJID());
+							if (m.getExtension("delay", "urn:xmpp:delay") == null) {
+								Element delayInformation = m.addChildElement("delay", "urn:xmpp:delay");
+								delayInformation.addAttribute("stamp", XMPPDateTimeFormat.format(unacked.timestamp));
+								delayInformation.addAttribute("from", serverAddress.toBareJID());
+							}
 						}
 						router.route(unacked.packet);
 					}