Make sure to write metadata and add tenant before notifying listener

1 files changed, 2 insertions, 2 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 396412f208f..392bc373c19 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
@@ -344,9 +344,9 @@ public class TenantRepository {
                                                                     tenantListener);
         log.log(Level.INFO, "Adding tenant '" + tenantName + "'" + ", created " + created);
         Tenant tenant = new Tenant(tenantName, sessionRepository, applicationRepo, applicationRepo, created);
-        notifyNewTenant(tenant);
-        tenants.putIfAbsent(tenantName, tenant);
         createAndWriteTenantMetaData(tenant);
+        tenants.putIfAbsent(tenantName, tenant);
+        notifyNewTenant(tenant);
         return tenant;
     }