Merge pull request #30044 from vespa-engine/jonmv/handle-dry-run-apps

Dry-run deployments leave no application ID, even though prepared

1 files changed, 4 insertions, 1 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ApplicationPackageMaintainer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ApplicationPackageMaintainer.java
index 4f10b1215cf..76879ccf8ae 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ApplicationPackageMaintainer.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ApplicationPackageMaintainer.java
@@ -69,7 +69,10 @@ public class ApplicationPackageMaintainer extends ConfigServerMaintainer {
                         continue;
                 }
 
-                var applicationId = session.getApplicationId();
+                ApplicationId applicationId = session.getOptionalApplicationId().orElse(null);
+                if (applicationId == null) // dry-run sessions have no application id
+                    continue;
+                
                 log.finest(() -> "Verifying application package for " + applicationId);
 
                 Optional<FileReference> appFileReference = session.getApplicationPackageReference();