Throw if file reference or vespa version not found for session in zk

1 files changed, 5 insertions, 7 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionZooKeeperClient.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionZooKeeperClient.java
index 23b6fe075fa..c2444e52f4d 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionZooKeeperClient.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionZooKeeperClient.java
@@ -3,7 +3,6 @@ package com.yahoo.vespa.config.server.session;
 
 import com.yahoo.cloud.config.ConfigserverConfig;
 import com.yahoo.component.Version;
-import com.yahoo.component.Vtag;
 import com.yahoo.config.FileReference;
 import com.yahoo.config.application.api.ApplicationPackage;
 import com.yahoo.config.application.api.DeployLogger;
@@ -38,6 +37,7 @@ import com.yahoo.vespa.curator.Curator;
 import com.yahoo.vespa.curator.transaction.CuratorOperations;
 import com.yahoo.vespa.curator.transaction.CuratorTransaction;
 import org.apache.zookeeper.data.Stat;
+
 import java.security.cert.X509Certificate;
 import java.time.Duration;
 import java.time.Instant;
@@ -182,9 +182,8 @@ public class SessionZooKeeperClient {
 
     FileReference readApplicationPackageReference() {
         Optional<byte[]> data = curator.getData(applicationPackageReferencePath());
-        if (data.isEmpty()) return null; // This should not happen.
-
-        return new FileReference(Utf8.toString(data.get()));
+        return new FileReference(Utf8.toString(
+                data.orElseThrow(() -> new IllegalArgumentException("No application package reference found"))));
     }
 
     private Path applicationPackageReferencePath() {
@@ -228,9 +227,8 @@ public class SessionZooKeeperClient {
     }
 
     public Version readVespaVersion() {
-        Optional<byte[]> data = curator.getData(versionPath());
-        // TODO: Empty version should not be possible any more - verify and remove
-        return data.map(d -> new Version(Utf8.toString(d))).orElse(Vtag.currentVersion);
+        return curator.getData(versionPath()).map(d -> new Version(
+                Utf8.toString(d))).orElseThrow(() -> new IllegalArgumentException("No vespa version found"));
     }
 
     public Optional<DockerImage> readDockerImageRepository() {