DB request scheduling scheme fails with district diagrams

[simantics/platform.git] / bundles / org.simantics.db.impl / src / org / simantics / db / impl / query / QueryThread.java

diff --git a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/QueryThread.java b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/QueryThread.java
index cfa088a2dbfd7a966e0af3db7f4d9a5aa5d1ad4c..7aa89b3f032ea68f08e75f1d65bd0c0e87bdc030 100644 (file)
--- a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/QueryThread.java
+++ b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/QueryThread.java
@@ -98,17 +98,7 @@ class QueryThread extends Thread implements SessionThread {
        }
 
        private boolean pumpTask() {
-           // First finish existing executions
-        if(!processor.freeScheduling.isEmpty()) {
-            tasks.add(processor.freeScheduling.removeFirst());
-            return true;
-        }
-        // Check for new tasks
-        if(!processor.topLevelTasks.isEmpty()) {
-            tasks.add(processor.topLevelTasks.removeFirst());
-            return true;
-        }
-               return false;
+           return processor.scheduling.pumpTask(tasks);
        }
        
        ArrayList<SessionTask> newTasks(boolean doWait, ArrayList<SessionTask> tasks) {