From 08ab0b6b997eefc740e98c0ba7025259889996a6 Mon Sep 17 00:00:00 2001 From: Valerij Fredriksen Date: Tue, 4 Jan 2022 13:33:51 +0100 Subject: Check if optional is present --- .../java/com/yahoo/vespa/hosted/controller/ApplicationController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java index 81f8831a8a7..a23cb40dcb1 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java @@ -87,7 +87,6 @@ import java.util.Optional; import java.util.Set; import java.util.TreeMap; import java.util.function.Consumer; -import java.util.function.Predicate; import java.util.logging.Level; import java.util.logging.Logger; import java.util.stream.Collectors; @@ -440,7 +439,8 @@ public class ApplicationController { for (Notification notification : controller.notificationsDb().listNotifications(NotificationSource.from(application.get().id()), true)) { if ( ! notification.source().instance().map(declaredInstances::contains).orElse(false)) controller.notificationsDb().removeNotifications(notification.source()); - if ( ! notification.source().zoneId().map(application.get().require(notification.source().instance().get()).deployments()::containsKey).orElse(false)) + if (notification.source().instance().isPresent() && + ! notification.source().zoneId().map(application.get().require(notification.source().instance().get()).deployments()::containsKey).orElse(false)) controller.notificationsDb().removeNotifications(notification.source()); } -- cgit v1.2.3