Delete entries with wrong application id

1 files changed, 2 insertions, 1 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/application/TenantApplications.java b/configserver/src/main/java/com/yahoo/vespa/config/server/application/TenantApplications.java
index acc1b2ecfde..10e45d041ec 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/application/TenantApplications.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/application/TenantApplications.java
@@ -122,7 +122,8 @@ public class TenantApplications implements RequestHandler, HostValidator<Applica
                       .filter(applicationId -> {
                           if ( ! applicationId.tenant().equals(tenant)) {
                               log.log(Level.WARNING, "There is an application ('" + applicationId + "') with wrong tenant (should be '" +
-                                                     tenant + "') in " + applicationsPath);
+                                                     tenant + "') in " + applicationsPath + ", deleting it");
+                              curator.delete(applicationsPath.append(applicationId.serializedForm()));
                               return false;
                           } else {
                               return true;