Merge pull request #1365 from fiibbb/lingy/fix-discovery-manager

Fix DiscoveryManager
Netflix · Nov 11, 2020 · 26f9b8c · 26f9b8c
2 parents 4dfa8f9 + 7a9e25c
commit 26f9b8c
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/...ain/java/com/netflix/appinfo/providers/CustomAmazonInfoProviderInstanceConfigFactory.java b/...ain/java/com/netflix/appinfo/providers/CustomAmazonInfoProviderInstanceConfigFactory.java
@@ -4,6 +4,7 @@
 import com.netflix.appinfo.Ec2EurekaArchaius2InstanceConfig;
 import com.netflix.appinfo.EurekaInstanceConfig;
 import com.netflix.archaius.api.Config;
+import com.netflix.discovery.DiscoveryManager;
 
 import javax.inject.Inject;
 import javax.inject.Provider;
@@ -26,6 +27,9 @@ public CustomAmazonInfoProviderInstanceConfigFactory(Config configInstance, Amaz
     public EurekaInstanceConfig get() {
         if (eurekaInstanceConfig == null) {
             eurekaInstanceConfig = new Ec2EurekaArchaius2InstanceConfig(configInstance, amazonInfoProvider);
+
+            // Copied from CompositeInstanceConfigFactory.get
+            DiscoveryManager.getInstance().setEurekaInstanceConfig(eurekaInstanceConfig);
         }
 
         return eurekaInstanceConfig;