fix null ref exception and init order

atidev · Nov 13, 2023 · f2d063b · f2d063b
1 parent 7492da4
commit f2d063b
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/ATI.Services.Consul/ConsulServiceAddressCache.cs b/ATI.Services.Consul/ConsulServiceAddressCache.cs
@@ -23,8 +23,9 @@ public ConsulServiceAddressCache(string serviceName, string environment, TimeSpa
         _serviceName = serviceName;
         _environment = environment;
         _consulAdapter = new ConsulAdapter();
+        _updateCacheTask = _consulAdapter.GetPassingServiceInstancesAsync(_serviceName, _environment);
+        _cachedServices = _updateCacheTask.GetAwaiter().GetResult();
         _updateCacheTimer = new Timer(_ => ReloadCache(), null, ttl, ttl);
-        _cachedServices = _consulAdapter.GetPassingServiceInstancesAsync(serviceName, environment).GetAwaiter().GetResult();
     }
 
     /// <summary>
@@ -38,7 +39,7 @@ public ConsulServiceAddressCache(string serviceName, string environment, TimeSpa
     /// </summary>
     private void ReloadCache()
     {
-        if(_updateCacheTask.IsCompleted)
+        if(_updateCacheTask == null || _updateCacheTask.IsCompleted)
             _updateCacheTask = _consulAdapter.GetPassingServiceInstancesAsync(_serviceName, _environment);
 
         _cachedServices = _updateCacheTask.GetAwaiter().GetResult();