Move application package deletion out of job type loop

1 files changed, 4 insertions, 3 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java
index fc8b299771d..da98dd0e165 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java
@@ -295,16 +295,17 @@ public class JobController {
                .filter(id -> ! applicationsToBuild.contains(id))
                .forEach(id -> {
                    try {
+                       TesterId tester = TesterId.of(id);
                        for (JobType type : jobs(id))
                            locked(id, type, deactivateTester, __ -> {
                                try (Lock ___ = curator.lock(id, type)) {
-                                   deactivateTester(TesterId.of(id), type);
+                                   deactivateTester(tester, type);
                                    curator.deleteRunData(id, type);
                                    logs.delete(id);
-                                   controller.applications().applicationStore().removeAll(id);
-                                   controller.applications().applicationStore().removeAll(TesterId.of(id));
                                }
                            });
+                       controller.applications().applicationStore().removeAll(id);
+                       controller.applications().applicationStore().removeAll(tester);
                    }
                    catch (TimeoutException e) {
                        return; // Don't remove the data if we couldn't clean up all resources.