Merge pull request #2846 from wmathurin/dev

Fix deadlock in AccMgrAuthTokenProvider when account is removed during token refresh

Author: wmathurin

libs/SalesforceSDK/src/com/salesforce/androidsdk/rest/ClientManager.java

@@ -393,30 +393,35 @@ public String getNewAuthToken() {
                 gettingAuthToken = true;
             }
 
-            // Only check for matching account inside synchronized thread that
-            // is actually getting the new auth token.
-            UserAccountManager userAccountManager = SalesforceSDKManager.getInstance().getUserAccountManager();
-            Account[] accounts = clientManager.getAccounts();
-            Account matchingAccount = null;
             String newAuthToken = null;
             String newInstanceUrl = null;
+            boolean shouldUpdateCache = false;
 
-            if (refreshToken != null) {
-                for (Account account : accounts) {
-                    UserAccount user = userAccountManager.buildUserAccount(account);
-                    if (user != null && refreshToken.equals(user.getRefreshToken())) {
-                        matchingAccount = account;
-                        break;
+            try {
+                // Only check for matching account inside synchronized thread that
+                // is actually getting the new auth token.
+                UserAccountManager userAccountManager = SalesforceSDKManager.getInstance().getUserAccountManager();
+                Account[] accounts = clientManager.getAccounts();
+                Account matchingAccount = null;
+
+                if (refreshToken != null) {
+                    for (Account account : accounts) {
+                        UserAccount user = userAccountManager.buildUserAccount(account);
+                        if (user != null && refreshToken.equals(user.getRefreshToken())) {
+                            matchingAccount = account;
+                            break;
+                        }
                     }
                 }
-            }
 
-            // Fail early to ensure we don't logout the current user below by sending null.
-            if (matchingAccount == null) {
-                return null;
-            }
+                // Fail early to ensure we don't logout the current user below by sending null.
+                if (matchingAccount == null) {
+                    return null;
+                }
+
+                // We found a matching account, so we'll attempt a refresh and should update the cache.
+                shouldUpdateCache = true;
 
-            try {
                 // Invalidate current auth token.
                 clientManager.invalidateToken(lastNewAuthToken);
                 final UserAccount userAccount = refreshStaleToken(matchingAccount);
@@ -460,9 +465,11 @@ public String getNewAuthToken() {
             } finally {
                 synchronized (lock) {
                     gettingAuthToken = false;
-                    lastNewAuthToken = newAuthToken;
-                    lastNewInstanceUrl = newInstanceUrl;
-                    lastRefreshTime  = System.currentTimeMillis();
+                    if (shouldUpdateCache) {
+                        lastNewAuthToken = newAuthToken;
+                        lastNewInstanceUrl = newInstanceUrl;
+                        lastRefreshTime  = System.currentTimeMillis();
+                    }
                     lock.notifyAll();
                 }
             }