1 files changed, 4 insertions, 7 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ListTenantsHandler.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ListTenantsHandler.java
index c2065249ad1..84df1834712 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ListTenantsHandler.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ListTenantsHandler.java
@@ -11,9 +11,8 @@ import com.yahoo.vespa.config.server.tenant.Tenants;
 
 /**
  * Handler to list tenants in the configserver
- * 
- * @author vegardh
  *
+ * @author vegardh
  */
 public class ListTenantsHandler extends HttpHandler {
 
@@ -25,12 +24,10 @@ public class ListTenantsHandler extends HttpHandler {
         this.tenants = tenants;
     }
 
-    
+
     @Override
     protected HttpResponse handleGET(HttpRequest request) {
-        return new ListTenantsResponse(tenants.tenantsCopy().keySet());
+        return new ListTenantsResponse(tenants.getAllTenants());
     }
-    
-    
-    
+
 }