Simplify and rename some methods

1 files changed, 3 insertions, 2 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ListApplicationsHandler.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ListApplicationsHandler.java
index 8b7c138642a..aaf10db3991 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ListApplicationsHandler.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ListApplicationsHandler.java
@@ -37,7 +37,7 @@ public class ListApplicationsHandler extends HttpHandler {
 
     @Override
     public HttpResponse handleGET(HttpRequest request) {
-        TenantName tenantName = Utils.getTenantFromApplicationsRequest(request);
+        TenantName tenantName = Utils.getTenantNameFromApplicationsRequest(request);
         final String urlBase = Utils.getUrlBase(request, "/application/v2/tenant/" + tenantName + "/application/");
 
         List<ApplicationId> applicationIds = listApplicationIds(tenantName);
@@ -51,7 +51,8 @@ public class ListApplicationsHandler extends HttpHandler {
     }
 
     private List<ApplicationId> listApplicationIds(TenantName tenantName) {
-        Tenant tenant = Utils.checkThatTenantExists(tenants, tenantName);
+        Utils.checkThatTenantExists(tenants, tenantName);
+        Tenant tenant = tenants.getTenant(tenantName);
         TenantApplications applicationRepo = tenant.getApplicationRepo();
         return applicationRepo.listApplications();
     }