Delete under lock and skip update part

1 files changed, 5 insertions, 3 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/notification/NotificationsDb.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/notification/NotificationsDb.java
index d470415f521..950dddfc056 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/notification/NotificationsDb.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/notification/NotificationsDb.java
@@ -67,10 +67,12 @@ public class NotificationsDb {
 
     /** Remove all notifications for this source or sources contained by this source */
     public void removeNotifications(NotificationSource source) {
-        if (source.application().isEmpty()) // Source is tenant
-            curatorDb.deleteNotifications(source.tenant());
-
         try (Lock lock = curatorDb.lockNotifications(source.tenant())) {
+            if (source.application().isEmpty()) { // Source is tenant
+                curatorDb.deleteNotifications(source.tenant());
+                return;
+            }
+
             List<Notification> initial = curatorDb.readNotifications(source.tenant());
             List<Notification> filtered = initial.stream()
                     .filter(notification -> !source.contains(notification.source()))