Hopefully fixed a concurrent modification crash in sync service

13 years ago · 26bee9c9d9
parent ad4d1b48a3
commit 26bee9c9d9
1 changed files with 4 additions and 2 deletions
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncService.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncService.java
@ -195,8 +195,10 @@ public final class ActFmSyncService {
                    }
                    if(failedPushes.size() > 0) {
                        // Copy into a second queue so we don't end up infinitely retrying in the same loop
-                        Queue<FailedPush> toTry = new LinkedList<FailedPush>(failedPushes);
-                        failedPushes.clear();
+                        Queue<FailedPush> toTry = new LinkedList<FailedPush>();
+                        while (failedPushes.size() > 0) {
+                            toTry.add(failedPushes.remove(0));
+                        }
                        while(!toTry.isEmpty() && !actFmPreferenceService.isOngoing()) {
                            FailedPush pushOp = toTry.remove();
                            switch(pushOp.pushType) {