Merge branch 'hotfix-4.0.8' into support-4.0

Particular · Oct 2, 2014 · cda7236 · cda7236
2 parents 28c580d + 4f651d1
commit cda7236
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/NServiceBus.Core/Persistence/Raven/TimeoutPersister/RavenTimeoutPersistence.cs b/src/NServiceBus.Core/Persistence/Raven/TimeoutPersister/RavenTimeoutPersistence.cs
@@ -33,6 +33,7 @@ private static IRavenQueryable<TimeoutData> GetChunkQuery(IDocumentSession sessi
                 .OrderBy(t => t.Time)
                 .Where(
                     t =>
+						t.OwningTimeoutManager == null ||
                         t.OwningTimeoutManager == String.Empty ||
                         t.OwningTimeoutManager == Configure.EndpointName);
         }
@@ -68,7 +69,7 @@ public List<Tuple<string, DateTime>> GetNextChunk(DateTime startSlice, out DateT
                 // Allow for occasionally cleaning up old timeouts for edge cases where timeouts have been
                 // added after startSlice have been set to a later timout and we might have missed them
                 // because of stale indexes.
-                if (lastCleanupTime.Add(TriggerCleanupEvery) > now || lastCleanupTime == DateTime.MinValue)
+                if (lastCleanupTime.Add(TriggerCleanupEvery) < now || lastCleanupTime == DateTime.MinValue)
                 {                    
                     results.AddRange(GetCleanupChunk(startSlice));
                 }