Directory cache is not optional.

1 files changed, 5 insertions, 5 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantRepository.java b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantRepository.java
index d62e13e9ea9..8641b7dcffe 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantRepository.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantRepository.java
@@ -118,7 +118,7 @@ public class TenantRepository {
     private final ExecutorService bootstrapExecutor;
     private final ScheduledExecutorService checkForRemovedApplicationsService =
             new ScheduledThreadPoolExecutor(1, new DaemonThreadFactory("check for removed applications"));
-    private final Optional<Curator.DirectoryCache> directoryCache;
+    private final Curator.DirectoryCache directoryCache;
     private final ZookeeperServerConfig zookeeperServerConfig;
 
     /**
@@ -207,9 +207,9 @@ public class TenantRepository {
         createPaths();
         createSystemTenants(configserverConfig);
 
-        this.directoryCache = Optional.of(curator.createDirectoryCache(tenantsPath.getAbsolute(), false, false, zkCacheExecutor));
-        this.directoryCache.get().addListener(this::childEvent);
-        this.directoryCache.get().start();
+        this.directoryCache = curator.createDirectoryCache(tenantsPath.getAbsolute(), false, false, zkCacheExecutor);
+        this.directoryCache.addListener(this::childEvent);
+        this.directoryCache.start();
         bootstrapTenants();
         notifyTenantsLoaded();
         checkForRemovedApplicationsService.scheduleWithFixedDelay(this::removeUnusedApplications,
@@ -533,7 +533,7 @@ public class TenantRepository {
     }
 
     public void close() {
-        directoryCache.ifPresent(com.yahoo.vespa.curator.Curator.DirectoryCache::close);
+        directoryCache.close();
         try {
             zkCacheExecutor.shutdown();
             checkForRemovedApplicationsService.shutdown();