Author: orudyy
Date: Tue May 12 16:09:51 2015
New Revision: 1678994
URL: http://svn.apache.org/r1678994
Log:
QPID-6527: Invoke callback action on initialization of management facade even
if preferences loading fails
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Management.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/UserPreferences.js
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Management.js
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Management.js?rev=1678994&r1=1678993&r2=1678994&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Management.js
(original)
+++
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Management.js
Tue May 12 16:09:51 2015
@@ -411,7 +411,7 @@ define(["dojo/_base/lang",
Management.prototype.loadUserPreferences = function(callback)
{
this.userPreferences = new UserPreferences(this);
- this.userPreferences.load(callback);
+ this.userPreferences.load(callback, callback);
};
return Management;
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/UserPreferences.js
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/UserPreferences.js?rev=1678994&r1=1678993&r2=1678994&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/UserPreferences.js
(original)
+++
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/UserPreferences.js
Tue May 12 16:09:51 2015
@@ -47,7 +47,14 @@ define(["dojo/date",
successCallback();
}
},
- function(error){that.preferencesError = error;});
+ function(error)
+ {
+ that.preferencesError = error;
+ if (failureCallback)
+ {
+ failureCallback();
+ }
+ });
}
UserPreferences.prototype.save = function(preferences, successCallback,
failureCallback)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
