Fixed bug with get lists that could cause infinite loop

haneytron · Sep 25, 2014 · e0f8b97 · e0f8b97
1 parent 220415c
commit e0f8b97
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/Dache.Client/CacheClient.cs b/Dache.Client/CacheClient.cs
@@ -227,12 +227,17 @@ public List<T> Get<T>(IEnumerable<string> cacheKeys)
                     rawResults = null;
                     foreach (var routingDictionaryEntry in routingDictionary)
                     {
-                        if (rawResults == null)
+                        var getResults = routingDictionaryEntry.Key.GetNext().Get(routingDictionaryEntry.Value);
+                        if (getResults != null)
                         {
-                            rawResults = routingDictionaryEntry.Key.GetNext().Get(routingDictionaryEntry.Value);
-                            continue;
+                            if (rawResults == null)
+                            {
+                                rawResults = getResults;
+                                continue;
+                            }
+
+                            rawResults.AddRange(getResults);
                         }
-                        rawResults.AddRange(routingDictionaryEntry.Key.GetNext().Get(routingDictionaryEntry.Value));
                     }
 
                     // If we got here we did all of the work successfully