Fix ConcurrentModificationException in Dispatcher.performSubmit()

lucasr · lucasr · commit bc4835facd8c · 2014-09-29T21:55:40.000+01:00
Fixes square#641
diff --git a/picasso/src/main/java/com/squareup/picasso/Dispatcher.java b/picasso/src/main/java/com/squareup/picasso/Dispatcher.java
@@ -161,6 +161,10 @@ void dispatchAirplaneModeChange(boolean airplaneMode) {
   }
 
   void performSubmit(Action action) {
+    performSubmit(action, true);
+  }
+
+  void performSubmit(Action action, boolean dismissFailed) {
     if (pausedTags.contains(action.getTag())) {
       pausedActions.put(action.getTarget(), action);
       if (action.getPicasso().loggingEnabled) {
@@ -186,7 +190,9 @@ void performSubmit(Action action) {
     hunter = forRequest(action.getPicasso(), this, cache, stats, action);
     hunter.future = service.submit(hunter);
     hunterMap.put(action.getKey(), hunter);
-    failedActions.remove(action.getTarget());
+    if (dismissFailed) {
+      failedActions.remove(action.getTarget());
+    }
 
     if (action.getPicasso().loggingEnabled) {
       log(OWNER_DISPATCHER, VERB_ENQUEUED, action.request.logId());
@@ -394,7 +400,7 @@ private void flushFailedActions() {
         if (action.getPicasso().loggingEnabled) {
           log(OWNER_DISPATCHER, VERB_REPLAYING, action.getRequest().logId());
         }
-        performSubmit(action);
+        performSubmit(action, false);
       }
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -161,6 +161,10 @@ void dispatchAirplaneModeChange(boolean airplaneMode) {`
`161`	`161`	`}`
`162`	`162`
`163`	`163`	`void performSubmit(Action action) {`
	`164`	`+ performSubmit(action, true);`
	`165`	`+ }`
	`166`	`+`
	`167`	`+ void performSubmit(Action action, boolean dismissFailed) {`
`164`	`168`	`if (pausedTags.contains(action.getTag())) {`
`165`	`169`	`pausedActions.put(action.getTarget(), action);`
`166`	`170`	`if (action.getPicasso().loggingEnabled) {`
`@@ -186,7 +190,9 @@ void performSubmit(Action action) {`
`186`	`190`	`hunter = forRequest(action.getPicasso(), this, cache, stats, action);`
`187`	`191`	`hunter.future = service.submit(hunter);`
`188`	`192`	`hunterMap.put(action.getKey(), hunter);`
`189`		`- failedActions.remove(action.getTarget());`
	`193`	`+ if (dismissFailed) {`
	`194`	`+ failedActions.remove(action.getTarget());`
	`195`	`+ }`
`190`	`196`
`191`	`197`	`if (action.getPicasso().loggingEnabled) {`
`192`	`198`	`log(OWNER_DISPATCHER, VERB_ENQUEUED, action.request.logId());`
`@@ -394,7 +400,7 @@ private void flushFailedActions() {`
`394`	`400`	`if (action.getPicasso().loggingEnabled) {`
`395`	`401`	`log(OWNER_DISPATCHER, VERB_REPLAYING, action.getRequest().logId());`
`396`	`402`	`}`
`397`		`- performSubmit(action);`
	`403`	`+ performSubmit(action, false);`
`398`	`404`	`}`
`399`	`405`	`}`
`400`	`406`	`}`