fix possible deadlock in serialized background androidannotations#1689

guitcastro · Feb 4, 2016 · 99a5170 · 99a5170
1 parent 8d8c6d4
commit 99a5170
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/...e/androidannotations-api/src/main/java/org/androidannotations/api/BackgroundExecutor.java b/...e/androidannotations-api/src/main/java/org/androidannotations/api/BackgroundExecutor.java
@@ -133,7 +133,7 @@ public static synchronized void execute(Task task) {
 			task.executionAsked = true;
 			future = directExecute(task, task.remainingDelay);
 		}
-		if (task.id != null || task.serial != null) {
+		if ((task.id != null || task.serial != null) && !task.managed.get()) {
 			/* keep task */
 			task.future = future;
 			TASKS.add(task);