cr comments

arunk054 · Jun 16, 2015 · 169df6c · 169df6c
1 parent ce903e5
commit 169df6c
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 23 deletions.
diff --git a/eureka-client/src/main/java/com/netflix/discovery/DiscoveryClient.java b/eureka-client/src/main/java/com/netflix/discovery/DiscoveryClient.java
@@ -224,23 +224,28 @@ public DiscoveryClient(ApplicationInfoManager applicationInfoManager, EurekaClie
 
     public DiscoveryClient(ApplicationInfoManager applicationInfoManager, EurekaClientConfig config, DiscoveryClientOptionalArgs args) {
         this(applicationInfoManager, config, args, new Provider<BackupRegistry>() {
+            private volatile BackupRegistry backupRegistryInstance;
             @Override
-            public BackupRegistry get() {
-                String backupRegistryClassName = clientConfig.getBackupRegistryImpl();
-                if (null != backupRegistryClassName) {
-                    try {
-                        return (BackupRegistry) Class.forName(backupRegistryClassName).newInstance();
-                    } catch (InstantiationException e) {
-                        logger.error("Error instantiating BackupRegistry.", e);
-                    } catch (IllegalAccessException e) {
-                        logger.error("Error instantiating BackupRegistry.", e);
-                    } catch (ClassNotFoundException e) {
-                        logger.error("Error instantiating BackupRegistry.", e);
+            public synchronized BackupRegistry get() {
+                if (backupRegistryInstance == null) {
+                    String backupRegistryClassName = clientConfig.getBackupRegistryImpl();
+                    if (null != backupRegistryClassName) {
+                        try {
+                            backupRegistryInstance = (BackupRegistry) Class.forName(backupRegistryClassName).newInstance();
+                        } catch (InstantiationException e) {
+                            logger.error("Error instantiating BackupRegistry.", e);
+                        } catch (IllegalAccessException e) {
+                            logger.error("Error instantiating BackupRegistry.", e);
+                        } catch (ClassNotFoundException e) {
+                            logger.error("Error instantiating BackupRegistry.", e);
+                        }
                     }
+
+                    logger.warn("Using default backup registry implementation which does not do anything.");
+                    backupRegistryInstance = new NotImplementedRegistryImpl();
                 }
 
-                logger.warn("Using default backup registry implementation which does not do anything.");
-                return new NotImplementedRegistryImpl();
+                return backupRegistryInstance;
             }
         });
     }

diff --git a/eureka-client/src/test/java/com/netflix/discovery/BackUpRegistryTest.java b/eureka-client/src/test/java/com/netflix/discovery/BackUpRegistryTest.java
@@ -4,14 +4,12 @@
 import java.util.List;
 import java.util.UUID;
 
-import com.google.inject.Provider;
+import com.google.inject.util.Providers;
 import com.netflix.appinfo.AmazonInfo;
 import com.netflix.appinfo.ApplicationInfoManager;
-import com.netflix.appinfo.CloudInstanceConfig;
 import com.netflix.appinfo.DataCenterInfo;
 import com.netflix.appinfo.InstanceInfo;
 import com.netflix.appinfo.MyDataCenterInstanceConfig;
-import com.netflix.appinfo.providers.EurekaConfigBasedInstanceInfoProvider;
 import com.netflix.config.ConfigurationManager;
 import com.netflix.discovery.shared.Application;
 import com.netflix.discovery.shared.Applications;
@@ -70,13 +68,12 @@ public Name getName() {
 
         backupRegistry = new MockBackupRegistry();
         setupBackupMock();
-        client = new DiscoveryClient(applicationInfoManager, new DefaultEurekaClientConfig(), null,
-                new Provider<BackupRegistry>() {
-                    @Override
-                    public BackupRegistry get() {
-                        return backupRegistry;
-                    }
-                });
+        client = new DiscoveryClient(
+                applicationInfoManager,
+                new DefaultEurekaClientConfig(),
+                null,
+                Providers.of((BackupRegistry)backupRegistry)
+        );
     }
 
     @After