diff --git a/NOTICE b/NOTICE
index 2c4a2fd15..495ab3409 100644
--- a/NOTICE
+++ b/NOTICE
@@ -29,6 +29,7 @@ Chris Deering
Christoph Fiehe
Craig Hesling
Damian Minkov
+Dan Caseley
Daniele Ricci
Daniel Henninger
Daniel Hintze
@@ -44,6 +45,7 @@ Fernando Ramirez
Florian Kimmann
Florian Schmaus
Francisco Vives
+Frank Matheron
Gaston Dombiak
Georg Lukas
Gilles Cornu
@@ -64,6 +66,7 @@ Jay Kline
Jeff Williams
Jesus Fuentes
John Haubrich
+Jonathan Lennox
JĂșlio Cesar Bueno Cotta
Lars Noschinski
Luca Stucchi
@@ -82,6 +85,7 @@ Pete Matern
Piotr Nosek
Rajat Kumar Gupta
Robin Collier
+Simon Abykov
Simon Schuster
Son Goku
Tairs Rzajevs
@@ -98,4 +102,4 @@ V Lau
Vyacheslav Blinov
Wolf Posdorfer
Xiaowei YAN
-Yash Thakkar
\ No newline at end of file
+Yash Thakkar
diff --git a/smack-bosh/src/main/java/org/jivesoftware/smack/bosh/XMPPBOSHConnection.java b/smack-bosh/src/main/java/org/jivesoftware/smack/bosh/XMPPBOSHConnection.java
index a88507719..76d8271ec 100644
--- a/smack-bosh/src/main/java/org/jivesoftware/smack/bosh/XMPPBOSHConnection.java
+++ b/smack-bosh/src/main/java/org/jivesoftware/smack/bosh/XMPPBOSHConnection.java
@@ -203,7 +203,8 @@ public class XMPPBOSHConnection extends AbstractXMPPConnection {
}
try {
- XmlPullParser parser = PacketParserUtils.getParserFor("");
+ XmlPullParser parser = PacketParserUtils.getParserFor(
+ "");
onStreamOpen(parser);
} catch (XmlPullParserException | IOException e) {
throw new AssertionError("Failed to setup stream environment", e);
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/packet/StanzaBuilder.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/StanzaBuilder.java
index 41265d633..f0c379fe8 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/packet/StanzaBuilder.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/packet/StanzaBuilder.java
@@ -184,6 +184,19 @@ public abstract class StanzaBuilder> implements Stanz
return getThis();
}
+ public final B removeExtension(String elementName, String namespace) {
+ QName key = new QName(namespace, elementName);
+ extensionElements.remove(key);
+ return getThis();
+ }
+
+ public final B removeExtension(ExtensionElement extension) {
+ QName key = extension.getQName();
+ List list = extensionElements.getAll(key);
+ list.remove(extension);
+ return getThis();
+ }
+
public abstract Stanza build();
public abstract B getThis();