From 6349782784c85e71ebe90b20657e9e7416577fd0 Mon Sep 17 00:00:00 2001
From: John Simons <john.simons@nservicebus.com>
Date: Thu, 17 Jul 2014 11:02:11 +1000
Subject: [PATCH] Making use of GetChunkQuery

---
 .../Persistence/RavenTimeoutPersistence.cs      | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/timeout/NServiceBus.Timeout.Hosting.Windows/Persistence/RavenTimeoutPersistence.cs b/src/timeout/NServiceBus.Timeout.Hosting.Windows/Persistence/RavenTimeoutPersistence.cs
index 6bfbb9e5089..6c134df1249 100644
--- a/src/timeout/NServiceBus.Timeout.Hosting.Windows/Persistence/RavenTimeoutPersistence.cs
+++ b/src/timeout/NServiceBus.Timeout.Hosting.Windows/Persistence/RavenTimeoutPersistence.cs
@@ -106,17 +106,12 @@ public List<Tuple<string, DateTime>> GetNextChunk(DateTime startSlice, out DateT
                     {
                         session.Advanced.AllowNonAuthoritativeInformation = true;
 
-                        var query = session.Query<TimeoutData>("RavenTimeoutPersistence/TimeoutDataSortedByTime")
-                            .Where(
-                                t =>
-                                    t.OwningTimeoutManager == String.Empty ||
-                                    t.OwningTimeoutManager == Configure.EndpointName)
-                            .Where(
-                                t =>
-                                    t.Time > startSlice &&
-                                    t.Time <= now)
-                            .OrderBy(t => t.Time)
-                            .Select(t => new { t.Id, t.Time })
+                        var query = GetChunkQuery(session)
+                            .Where(
+                                t =>
+                                    t.Time > startSlice &&
+                                    t.Time <= now)
+                            .Select(t => new { t.Id, t.Time })
                             .Statistics(out stats);
                         do
                         {