Dont support delete if exist in transaction

3 files changed, 4 insertions, 4 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/Rotations.java b/configserver/src/main/java/com/yahoo/vespa/config/server/Rotations.java
index b8a0d344f09..4584e36b0a1 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/Rotations.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/Rotations.java
@@ -71,7 +71,7 @@ public class Rotations {
         Path rotationsPath = path.append(applicationId.serializedForm());
         if ( ! curator.exists(rotationsPath)) return CuratorTransaction.empty(curator);
 
-        return CuratorTransaction.from(CuratorOperations.deleteOrThrow(rotationsPath.getAbsolute()), curator);
+        return CuratorTransaction.from(CuratorOperations.delete(rotationsPath.getAbsolute()), curator);
     }
 
 }
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 eb0e9ea3f24..46278120b0d 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
@@ -84,7 +84,7 @@ public class ZKApplicationRepo implements ApplicationRepo, PathChildrenCacheList
             if (curator.framework().checkExists().forPath(newPath) == null) {
                 transaction.add(CuratorOperations.create(newPath, Utf8.toAsciiBytes(sessionId)));
             }
-            transaction.add(CuratorOperations.deleteOrThrow(oldPath));
+            transaction.add(CuratorOperations.delete(oldPath));
             transaction.commit();
         } catch (Exception e) {
             log.log(LogLevel.WARNING, "Error rewriting application id from " + origNode + " to " + appId.serializedForm());
@@ -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.deleteOrThrow(path.getAbsolute()), curator);
+        return CuratorTransaction.from(CuratorOperations.delete(path.getAbsolute()), curator);
     }
 
     @Override
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionZooKeeperClient.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionZooKeeperClient.java
index fda3b46fd47..567ec4718ca 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionZooKeeperClient.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionZooKeeperClient.java
@@ -127,7 +127,7 @@ public class SessionZooKeeperClient {
         }
     }
 
-    /** Returns a transaction deleting this path on commit */
+    /** Returns a transaction deleting this session on commit */
     public CuratorTransaction deleteTransaction() {
         return CuratorTransaction.from(CuratorOperations.delete(rootPath.getAbsolute()), curator);
     }