Merge pull request pjvds#79 from matt-sullivan/event-store-fix

Fix InMemoryBufferedBrowsableElementStore incorrectly discarding events
apkalexei · Oct 12, 2011 · ed26668 · ed26668
2 parents d90bcb7 + bb725d6
commit ed26668
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/Extensions/src/Ncqrs.EventBus/InMemoryBufferedBrowsableElementStore.cs b/Extensions/src/Ncqrs.EventBus/InMemoryBufferedBrowsableElementStore.cs
@@ -41,7 +41,11 @@ private IEnumerable<IProcessingElement> FetchFromBuffer()
 
         private IEnumerable<IProcessingElement> FetchFromPersistentStoreAndCorrelateWithBuffer(string pipelineName)
         {
-            var fetchedFromPersistentStore = _persistentStore.Fetch(pipelineName, _fetchSize);
+            // We need to copy the fetched items to prevent fetchedFromPersistentStore.Any()
+            // and/or CorrelateWithBufffer consuming events and not returning them.
+            // Rx extensions MemoizeAll would be a good solution, but I'm not sure we want
+            // an extra dependency, ToList is fine as long as _fetchSize is reasonable.
+            var fetchedFromPersistentStore = _persistentStore.Fetch(pipelineName, _fetchSize).ToList();
             if (!fetchedFromPersistentStore.Any() || CorrelateWithBufffer(fetchedFromPersistentStore))
             {
                 _inMemoryMode = true;