From 517e3749251206df8028d7bb83f7415ac0dc4514 Mon Sep 17 00:00:00 2001 From: Ben McIlwain Date: Mon, 30 Jan 2017 16:55:33 -0500 Subject: [PATCH] Remove duplicate RegistryConfig code section from mangled merge --- .../google/registry/config/RegistryConfig.java | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/java/google/registry/config/RegistryConfig.java b/java/google/registry/config/RegistryConfig.java index 6fc5f5622..417786dc8 100644 --- a/java/google/registry/config/RegistryConfig.java +++ b/java/google/registry/config/RegistryConfig.java @@ -1233,24 +1233,6 @@ public final class RegistryConfig { return CONFIG_SETTINGS.get().registryPolicy.contactAndHostRoidSuffix; } - /** - * Memoizes loading of the {@link RegistryConfigSettings} POJO. - * - *

Memoizing without cache expiration is used because the app must be re-deployed in order to - * change the contents of the YAML config files. - */ - private static final Supplier CONFIG_SETTINGS = - memoize(new Supplier() { - @Override - public RegistryConfigSettings get() { - return getConfigSettings(); - }}); - - /** Returns the roid suffix to be used for the roids of all contacts and hosts. */ - public static String getContactAndHostRoidSuffix() { - return CONFIG_SETTINGS.get().registryPolicy.contactAndHostRoidSuffix; - } - /** * Memoizes loading of the {@link RegistryConfigSettings} POJO. *