From b5e7691d2f6a361f038a3aa8d0c5c8bce2744531 Mon Sep 17 00:00:00 2001
From: Jon Marius Venstad <venstad@gmail.com>
Date: Sat, 2 Mar 2019 13:40:37 +0100
Subject: Treat empty nodes as non-existent

---
 .../com/yahoo/vespa/config/server/application/TenantApplications.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'configserver')

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();
-- 
cgit v1.2.3