Mercury-IM/Smack
Mercury-IM/Smack
1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2024-11-25 15:52:06 +01:00
Code Issues Releases Wiki Activity

Fix Stanza.overrideExtension(ExtensionElement)

Browse source 
Also fixes SMACK-818.
This commit is contained in:
Florian Schmaus 2018-05-10 15:34:24 +02:00
parent 458d8d98b6
commit 0e31bc8f73
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
smack-core/src/main/java/org/jivesoftware/smack/packet/Stanza.java
View file

@ -394,7 +394,10 @@ public abstract class Stanza implements TopLevelStreamElement {
public ExtensionElement overrideExtension(ExtensionElement extension) { public ExtensionElement overrideExtension(ExtensionElement extension) {
if (extension == null) return null; if (extension == null) return null;
synchronized (packetExtensions) { synchronized (packetExtensions) {
ExtensionElement removedExtension = removeExtension(extension); // Note that we need to use removeExtension(String, String) here. If would use
// removeExtension(ExtensionElement) then we would remove based on the equality of ExtensionElement, which
// is not what we want in this case.
ExtensionElement removedExtension = removeExtension(extension.getElementName(), extension.getNamespace());
addExtension(extension); addExtension(extension);
return removedExtension; return removedExtension;
} }