diff options
| author | Jon Bratseth <bratseth@yahoo-inc.com> | 2017-03-28 13:00:40 +0200 |
|---|---|---|
| committer | Jon Bratseth <bratseth@yahoo-inc.com> | 2017-03-28 13:00:40 +0200 |
| commit | cd85b0b4b36092550a5c2f6608cab61324817c31 (patch) | |
| tree | 92dd2d7320535962239a69a1ea981be4cb8e216d /configserver | |
| parent | 722220fe05994f51b0d55b7a3aacd8f2d5cd5f33 (diff) | |
Remove old legacy
Diffstat (limited to 'configserver')
2 files changed, 4 insertions, 4 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/application/ZKTenantApplications.java b/configserver/src/main/java/com/yahoo/vespa/config/server/application/ZKTenantApplications.java index 814c29504ed..5d6aba7b65b 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/application/ZKTenantApplications.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/application/ZKTenantApplications.java @@ -118,7 +118,7 @@ public class ZKTenantApplications implements TenantApplications, PathChildrenCac private Optional<ApplicationId> parseApplication(String appNode) { try { - return Optional.of(ApplicationId.fromSerializedForm(tenant, appNode)); + return Optional.of(ApplicationId.fromSerializedForm(appNode)); } catch (IllegalArgumentException e) { log.log(LogLevel.INFO, Tenants.logPre(tenant)+"Unable to parse application with id '" + appNode + "', ignoring."); return Optional.empty(); @@ -156,10 +156,10 @@ public class ZKTenantApplications implements TenantApplications, PathChildrenCac public void childEvent(CuratorFramework client, PathChildrenCacheEvent event) throws Exception { switch (event.getType()) { case CHILD_ADDED: - applicationAdded(ApplicationId.fromSerializedForm(tenant, Path.fromString(event.getData().getPath()).getName())); + applicationAdded(ApplicationId.fromSerializedForm(Path.fromString(event.getData().getPath()).getName())); break; case CHILD_REMOVED: - applicationRemoved(ApplicationId.fromSerializedForm(tenant, Path.fromString(event.getData().getPath()).getName())); + applicationRemoved(ApplicationId.fromSerializedForm(Path.fromString(event.getData().getPath()).getName())); break; } } diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionZooKeeperClient.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionZooKeeperClient.java index da1fda43f9f..ecb5d0980bb 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionZooKeeperClient.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionZooKeeperClient.java @@ -159,7 +159,7 @@ public class SessionZooKeeperClient { log.log(LogLevel.INFO, "Unable to locate application id at '" + path + "', returning default"); return ApplicationId.defaultId(); } - return ApplicationId.fromSerializedForm(tenant, configCurator.getData(path)); + return ApplicationId.fromSerializedForm(configCurator.getData(path)); } catch (RuntimeException e) { throw new RuntimeException("Unable to read application id from '" + path + "'", e); } |