Merge from trunk

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-6262-JavaBrokerNIO@1666200 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 14 insertions, 24 deletions

diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAuthenticationProvider.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAuthenticationProvider.js
index ccae89d6c1..d367537731 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAuthenticationProvider.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addAuthenticationProvider.js
@@ -155,31 +155,21 @@ define(["dojo/_base/xhr",
                     var authenticationProviderData = util.getFormWidgetValues(this.authenticationProviderForm, this.initialData);
 
                     var encodedAuthenticationProviderName = encodeURIComponent(this.authenticationProviderName.value);
-                    xhr.put({
-                        url: "api/latest/authenticationprovider/" + encodedAuthenticationProviderName,
-                        sync: true,
-                        handleAs: "json",
-                        headers: { "Content-Type": "application/json"},
-                        putData: json.stringify(authenticationProviderData),
-                        load: function(x) {success = true; },
-                        error: function(error) {success = false; failureReason = error;}
-                    });
-
-                    if(success === true)
-                    {
-                        var preferencesProviderResult = this.preferencesProviderForm.submit(encodedAuthenticationProviderName);
-                        success = preferencesProviderResult.success;
-                        failureReason = preferencesProviderResult.failureReason;
-                    }
+                    var that = this;
 
-                    if (success == true)
-                    {
-                        this.dialog.hide();
-                    }
-                    else
-                    {
-                        util.xhrErrorHandler(failureReason);
-                    }
+                    var methodName = this.initialData ? "put" : "post";
+                    util[methodName]("api/latest/authenticationprovider/" + encodedAuthenticationProviderName, authenticationProviderData,
+                     function(x){
+                        var preferencesProviderResult = that.preferencesProviderForm.submit(encodedAuthenticationProviderName);
+                        if (preferencesProviderResult.success == true)
+                        {
+                            that.dialog.hide();
+                        }
+                        else
+                        {
+                             util.xhrErrorHandler(preferencesProviderResult.failureReason);
+                        }
+                     });
                 }
                 else
                 {