Merge pull request #8659 from vespa-engine/jvenstad/intermediary-fix-for-empty-zk-nodes

Treat empty nodes as non-existent

1 files changed, 3 insertions, 1 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/application/TenantApplications.java b/configserver/src/main/java/com/yahoo/vespa/config/server/application/TenantApplications.java
index 2c4d3d99408..7731e13eac2 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/application/TenantApplications.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/application/TenantApplications.java
@@ -84,7 +84,9 @@ public class TenantApplications {
 
     private Optional<ApplicationId> parseApplication(String appNode) {
         try {
-            return Optional.of(ApplicationId.fromSerializedForm(appNode));
+            ApplicationId id = ApplicationId.fromSerializedForm(appNode);
+            getSessionIdForApplication(id);
+            return Optional.of(id);
         } catch (IllegalArgumentException e) {
             log.log(LogLevel.INFO, TenantRepository.logPre(tenant)+"Unable to parse application with id '" + appNode + "', ignoring.");
             return Optional.empty();