github/meteor
1
1
Fork 0
mirror of https://github.com/meteor/meteor.git synced 2026-05-02 03:01:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix a "Future resolved more than once" error

Browse Source
This commit is contained in:
Geoff Schmidt
2014-02-18 15:38:26 -08:00
parent bee4fbbd24
commit 97d2264a3a
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tools/auth.js
View File

@@ -229,8 +229,13 @@ var currentUsername = function (data) {
// username, then ask the server if we have one.
var username = null;
var fut = new Future();
var resolved = false;
var connection = loggedInAccountsConnection(sessionData.token);
connection.call('getUsername', function (err, result) {
if (resolved)
return;
resolved = true;
if (err) {
// If anything went wrong, return null just as we would have if
// we hadn't bothered to ask the server.
@@ -240,12 +245,16 @@ var currentUsername = function (data) {
fut['return'](result);
});
setTimeout(inFiber(function () {
fut['return'](null);
var timer = setTimeout(inFiber(function () {
if (! resolved) {
fut['return'](null);
resolved = true;
}
}), 5000);
username = fut.wait();
connection.close();
clearTimeout(timer);
if (username) {
writeMeteorAccountsUsername(username);
}