0001528: Routing can get stuck if there are lots of gaps that range a…

…cross a large amount of data that has already been routed

symmetric-core/src/main/java/org/jumpmind/symmetric/route/DataGapRouteReader.java

@@ -166,8 +166,8 @@ protected void execute() {
             if (cursor != null) {
                 cursor.close();
             }
-            copyToQueue(new EOD());
             reading = false;
+            copyToQueue(new EOD());
         }
 
     }
@@ -191,13 +191,18 @@ protected boolean process(Data data) {
     }
 
     public Data take() throws InterruptedException {
-        Data data = dataQueue.poll(takeTimeout, TimeUnit.SECONDS);
-
-        if (data == null) {
-            throw new SymmetricException("The read of the data to route queue has timed out");
-        } else if (data instanceof EOD) {
-            data = null;
-        }
+        Data data = null;
+        do {
+            data = dataQueue.poll(takeTimeout, TimeUnit.SECONDS);
+
+            if (data == null && !reading) {
+                throw new SymmetricException("The read of the data to route queue has timed out");
+            } else if (data instanceof EOD) {
+                data = null;
+            } 
+
+        } while (data == null && reading);
+
         return data;
     }