Avoid delete if exist in transaction

2 files changed, 1 insertions, 8 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/application/ZKApplicationRepo.java b/configserver/src/main/java/com/yahoo/vespa/config/server/application/ZKApplicationRepo.java
index 753956ef7bf..eb0e9ea3f24 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/application/ZKApplicationRepo.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/application/ZKApplicationRepo.java
@@ -139,7 +139,7 @@ public class ZKApplicationRepo implements ApplicationRepo, PathChildrenCacheList
     @Override
     public CuratorTransaction deleteApplication(ApplicationId applicationId) {
         Path path = root.append(applicationId.serializedForm());
-        return CuratorTransaction.from(CuratorOperations.delete(path.getAbsolute()), curator);
+        return CuratorTransaction.from(CuratorOperations.deleteOrThrow(path.getAbsolute()), curator);
     }
 
     @Override
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/application/ApplicationRepoTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/application/ApplicationRepoTest.java
index 148f9ca2d6e..50ef49b2572 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/application/ApplicationRepoTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/application/ApplicationRepoTest.java
@@ -116,13 +116,8 @@ public class ApplicationRepoTest extends TestWithCurator {
         repo.createPutApplicationTransaction(id1, 1).commit();
         repo.createPutApplicationTransaction(id2, 1).commit();
         assertThat(repo.listApplications().size(), is(2));
-        System.out.println("------ Test deleting " + id1);
         repo.deleteApplication(id1).commit();
         assertThat(repo.listApplications().size(), is(1));
-        System.out.println("------ Test deleting " + id2);
-        repo.deleteApplication(id2).commit();
-        assertThat(repo.listApplications().size(), is(0));
-        System.out.println("------ Test deleting " + id2);
         repo.deleteApplication(id2).commit();
         assertThat(repo.listApplications().size(), is(0));
     }
@@ -154,8 +149,6 @@ public class ApplicationRepoTest extends TestWithCurator {
             repo.deleteApplication(id1).commit();
             assertThat(repo.listApplications().size(), is(1));
             repo.deleteApplication(id2).commit();
-            assertThat(repo.listApplications().size(), is(0));
-            repo.deleteApplication(id2).commit();
         }
     }