diff --git a/smack-core/src/main/java/org/jivesoftware/smack/ConnectionConfiguration.java b/smack-core/src/main/java/org/jivesoftware/smack/ConnectionConfiguration.java
index a5b12da29..55f76798a 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/ConnectionConfiguration.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/ConnectionConfiguration.java
@@ -472,7 +472,16 @@ public abstract class ConnectionConfiguration {
return enabledSaslMechanisms.contains(saslMechanism);
}
+ /**
+ * Return the explicitly enabled SASL mechanisms. May return null
if no SASL mechanisms where
+ * explicitly enabled, i.e. all SALS mechanisms supported and announced by the service will be considered.
+ *
+ * @return the enabled SASL mechanisms or null
.
+ */
public Set getEnabledSaslMechanisms() {
+ if (enabledSaslMechanisms == null) {
+ return null;
+ }
return Collections.unmodifiableSet(enabledSaslMechanisms);
}