Merge pull request #274 from tevans/OF-938

OF-938: Use correct namespace for BOSH packets
igniterealtime · Aug 14, 2015 · e387da5 · e387da5
2 parents d29034d + 2336652
commit e387da5
Showing 1 changed file with 5 additions and 13 deletions.
diff --git a/src/java/org/jivesoftware/openfire/http/HttpSession.java b/src/java/org/jivesoftware/openfire/http/HttpSession.java
@@ -1173,19 +1173,11 @@ public Deliverable(Collection<Packet> elements) {
             this.text = null;
             this.packets = new ArrayList<String>();
             for (Packet packet : elements) {
-                // Rewrite packet namespace according XEP-0206
-                if (packet instanceof Presence) {
-                    this.packets.add("<presence xmlns=\"jabber:client\"" + packet.toXML().substring(9));
-                }
-                else if (packet instanceof IQ) {
-                    this.packets.add("<iq xmlns=\"jabber:client\"" + packet.toXML().substring(3));
-                }
-                else if (packet instanceof Message) {
-                    this.packets.add("<message xmlns=\"jabber:client\"" + packet.toXML().substring(8));
-                }
-                else {
-                    this.packets.add(packet.toXML());
-                }
+                // Append packet namespace according XEP-0206 if needed
+            	if (Namespace.NO_NAMESPACE.equals(packet.getElement().getNamespace())) {
+            		packet.getElement().add(Namespace.get("jabber:client"));
+            	}
+            	this.packets.add(packet.toXML());
             }
         }