Merge branch 'resource-conflict' into merge

metajack · Nov 9, 2011 · 289d5f1 · 289d5f1
2 parents ca29079 + c619157
commit 289d5f1
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/core.js b/src/core.js
@@ -3311,7 +3311,11 @@ Strophe.Connection.prototype = {
     {
         if (elem.getAttribute("type") == "error") {
             Strophe.info("SASL binding failed.");
-            this._changeConnectStatus(Strophe.Status.AUTHFAIL, null);
+			var conflict = elem.getElementsByTagName("conflict"), condition;
+			if (conflict.length > 0) {
+				condition = 'conflict';
+			}
+            this._changeConnectStatus(Strophe.Status.AUTHFAIL, condition);
             return false;
         }